Git merges in Moodle 2.5.4 by Eloy Lafuente (stronk7)

commit 77f8d8142fd5d0a9093c513e3726e9364279e608
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Jan 2014 17:10:37 +0800
Tag:    v2.5.4

Merge branch 'MDL-43590-en_fix_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit ccd01c08f4501b372b90f0cb2defe22c7a454d60
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:18:21 +0800
Tag:    v2.5.4

Merge branch 'MDL-40119-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 51add5708c119a9511d3cc227167f598af15a054
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:11:13 +0800
Tag:    v2.5.4

Merge branch 'w01_MDL-42797_m25_admin' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 6cb311f306110cee749190bc49f663f53817e7c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 09:03:16 +0800
Tag:    v2.5.4

Merge branch 'MDL-43423_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit f9e99683f76f663eab95259839dc5c11abd0b82d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 08:52:48 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-42310-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit cedb3f64285771bb0169fc582b1f58f30218a9ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:46:20 +0800
Tag:    v2.5.4

Merge branch 'm25_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit dcc69ec0403409aa67bec75f2186923e7c466cb4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:42:52 +0800
Tag:    v2.5.4

Merge branch 'MDL-42607_rss_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE

commit d88a96388330fc03cb248fd72d34ba28ba3f1e96
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Jan 2014 07:34:01 +0800
Tag:    v2.5.4

Merge branch 'MDL-42392-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit d4a8372892760607b737fddfd44dabbc28c43069
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Dec 2013 07:51:09 +0800
Tag:    v2.5.4

Merge branch 'MDL-43318-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

commit 404b3d265434d6d878150784083efc842076a4f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Dec 2013 19:09:20 +0800
Tag:    v2.5.4

Merge branch 'MDL-43404_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 1b646dc3627ca1abc4a162afa15284c4530af195
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Dec 2013 17:29:42 +0800
Tag:    v2.5.4

Merge branch 'MDL-43306-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 47c14f40b782adb90cf1642a04315e7021bef3f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Dec 2013 08:17:39 +0800
Tag:    v2.5.4

Merge branch 'w50_MDL-31410_m25_paypalipn' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 175b9dcfff1a3895b36324768019fd39b0604705
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Dec 2013 02:46:59 +0800
Tag:    v2.5.4

Merge branch '25STABLE-wip-MDL-43135' of https://github.com/jennymgray/moodle into MOODLE_25_STABLE

commit 3efc95ed812bc46446d12fdc315d13a2dfd6f399
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Dec 2013 23:24:44 +0800
Tag:    v2.5.4

Merge branch 'MDL-40003-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit f0b9fd3348a1522f08a781e2d89ea7306240e4d3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:55:56 +0800
Tag:    v2.5.4

Merge branch 'MDL-41446-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit fd73fdaec03a8293f547887934793872208ce671
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:41:34 +0800
Tag:    v2.5.4

Merge branch 'MDL-43142_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit 008b26a6098ff663b1ddb5ade6fb26e7086ecb29
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 06:25:43 +0800
Tag:    v2.5.4

Merge branch 'MDL-43140_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit e81cd4c37582e6b5610d9242f321c6a561c03701
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Dec 2013 00:18:26 +0800
Tag:    v2.5.4

Merge branch 'moodle25-mdl33971' of https://github.com/tlock/moodle into MOODLE_25_STABLE

commit b357a2a0837a013a0c3c1a1744f9db8a39a69aef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Dec 2013 22:38:24 +0800
Tag:    v2.5.4

Merge branch 'MDL-43079-25' of https://github.com/jamiepratt/moodle into MOODLE_25_STABLE

commit 35d228442380910680143cd4781d33f4beac319c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Dec 2013 17:02:00 +0800
Tag:    v2.5.4

Merge branch 'MDL-42885_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit 9703d42284fb0311283eb3af669afddf22121a3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Nov 2013 04:30:31 +0800
Tag:    v2.5.4

Merge branch 'm25_MDL-43045' of git://github.com/totara/moodle into MOODLE_25_STABLE

commit a24766c374e2042cdc802424fd246abd7104da61
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 24 Nov 2013 23:51:12 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-29071-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 7ce12c2d745aa241548a40f991373c490800a5de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 22 Nov 2013 02:33:33 +0800
Tag:    v2.5.4

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 55dc7b6be9b132e58c34bd5151caaf40da517790
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 18:14:54 +0800
Tag:    v2.5.4

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 850fd970cbad2fd626c835e765702ac12cea4d68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 09:14:15 +0800
Tag:    v2.5.4

Merge branch 'MDL-42447_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 4233914802db0f9f507f9d76b6f4ad077a0a38e1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Nov 2013 09:06:02 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-42912-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 262edf64ca7beb601842d5918d8121a4aed98bbe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 14 Nov 2013 06:15:51 +0800
Tag:    v2.5.4

Merge branch 'MDL-42768-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 5d4b5a560a71caacef0fd16c8816214981afb01f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:12:45 +0800
Tag:    v2.5.4

Merge branch 'MDL-42790_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit d385005eaffdf5364654c85f7e409672d1d99036
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:10:20 +0800
Tag:    v2.5.4

Merge branch 'MDL-42839-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit 4ac33ebc0512c5887120e8e5be8fc73d37886948
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 08:02:55 +0800
Tag:    v2.5.4

Merge branch 'wip_25_mdl-42723' of https://github.com/iarenaza/moodle into MOODLE_25_STABLE

commit e17a5a4d21969f09f6efe62815a0ee2de18f1682
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Nov 2013 03:07:14 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-42672-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 3bf475dbfe629f5ca3fa8ea41d5b59e18c533d13
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Nov 2013 07:41:38 +0800
Tag:    v2.5.4

Merge branch 'MDL-40481_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE