Git merges in Moodle 2.5.x by Eloy Lafuente (stronk7)

commit 495d15279baf0b02aba2adf5686f7e21226e9def
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Mar 2014 05:17:05 +0800
Tag:    v2.5.5

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

commit bf6f9d043d42d47faf214c03e59b5d65a06aa637
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Mar 2014 07:37:09 +0800
Tag:    v2.5.5

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

commit 6e21938526085115227356c90c0f924b002bf675
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Feb 2014 19:43:17 +0800
Tag:    v2.5.5

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

commit cb3385aefad9e987c98ec50a6b10409bc5775173
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 06:56:23 +0800
Tag:    v2.5.5

Merge branch 'MDL-43265_25' of https://github.com/jacks92/moodle into MOODLE_25_STABLE

commit 28644233349a8d5789e2681af103d347110677c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Feb 2014 06:25:44 +0800
Tag:    v2.5.5

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

commit 42651ea3f17cb2081f555513edbc1e08ec58a7b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Feb 2014 09:12:30 +0800
Tag:    v2.5.5

Merge branch '43822-25-fixonly' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit ac58bd76b840ae7206862bfe5eed430d6ba3b950
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 13 Feb 2014 22:29:53 +0800
Tag:    v2.5.5

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

commit 06a25d72fad948c520f9fdc760c2a7c3d901427f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 17:41:10 +0800
Tag:    v2.5.5

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

commit ae9a8e772ab71d039615cbc3384386986960e1d5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 07:12:18 +0800
Tag:    v2.5.5

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

commit 85f47a3ebd92e767700ddd2121551b2390630fa5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 06:58:22 +0800
Tag:    v2.5.5

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

commit ba971d4ccae53b3a85f586eeff2afc91927900ee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Feb 2014 00:58:49 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-37714' of git://github.com/greg-or/moodle into MOODLE_25_STABLE

commit 23cf5d3da267951603513f6435772c9261419f8a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 07:44:49 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-43797' of https://github.com/totara/moodle into MOODLE_25_STABLE

commit 68fe9b045c9e451d4b514585263a7d2612129aba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 07:01:26 +0800
Tag:    v2.5.5

Merge branch '43688-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 2ee4c9957532294268b3db8ca032a209438b5b73
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 06:53:40 +0800
Tag:    v2.5.5

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

commit e3870e29d8558c026d928b5d26a81cda2bdfb718
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 04:11:23 +0800
Tag:    v2.5.5

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

commit 238e8a94f8c9cb1e7ae4075cf1c1070e8c90c0cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 02:20:52 +0800
Tag:    v2.5.5

Merge branch 'wip-mdl-43766-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 7e84ef177d695c89b61e3a18a5536da50ca00c4d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 00:23:32 +0800
Tag:    v2.5.5

Merge branch 'MDL-43773-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_STABLE

commit 333751af3a8100ccb9a1eabaf5c5138959f2dcb0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Jan 2014 00:04:47 +0800
Tag:    v2.5.5

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

commit f6590d5dd30786f884e9967a6fae411758ac6bf1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 19:02:51 +0800
Tag:    v2.5.5

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

commit e373f3bd042d04f2ac61fb823a2270fa192fe75d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Jan 2014 18:00:47 +0800
Tag:    v2.5.5

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

commit cd3c9e492b581171050f1b94b98830e5348dfb58
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Jan 2014 19:38:29 +0800
Tag:    v2.5.5

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

commit 38dc2cc5bd91a5f12b657736d8fcf4795b51084e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:47:00 +0800
Tag:    v2.5.5

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

commit 1075da56e21eb04a5d3af2dd42948c848bc4e2e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:44:56 +0800
Tag:    v2.5.5

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

commit 3dfaeb413b5df7bc7106250800c6d368e856d0f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 08:14:01 +0800
Tag:    v2.5.5

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

commit 3dfb63df12e161ac2972eec76d3498a7eee0f595
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:21:58 +0800
Tag:    v2.5.5

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

commit 9a0d6896d0c50b333f00b5554bc2aefb7de0c63f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:17:48 +0800
Tag:    v2.5.5

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

commit db8c137e3583de9d7f63b0089fd3fbb7379c8341
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 07:03:03 +0800
Tag:    v2.5.5

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

commit 2ad45eaf5330ca3b35274e6bcf8e893cb6fd1fb1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Jan 2014 06:43:05 +0800
Tag:    v2.5.5

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

commit 2e3aa01daae548aedc157dbb5311686aee6ba1cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jan 2014 01:51:04 +0800
Tag:    v2.5.5

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

commit cc3bfdc006531840e29f8b9f8aeb243e131a39fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Jan 2014 05:02:54 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-43222' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit a89836aa2762ff9cef118f449a9ac239fca11c41
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Jan 2014 02:08:02 +0800
Tag:    v2.5.5

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

commit 5d394d10a3432acfcec516ab0530e7f94d673377
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:57:13 +0800
Tag:    v2.5.5

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

commit 712cb8569e69ab25e950b2da4fdc5fda2600e3a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 23:45:53 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-43222' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 5af2e8c082a05a6d4a7fab4117aed2fe962665eb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Jan 2014 04:55:18 +0800
Tag:    v2.5.5

Merge branch 'MDL-43109_25' of https://github.com/mdikih/moodle into MOODLE_25_STABLE

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

commit a10883149732cd7ad56636a63523ff88b22e2351
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 19:03:36 +0800
Tag:    v2.5.3

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

commit 183058c8b577d04ac088e1de3767944b9619a660
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Oct 2013 07:13:46 +0800
Tag:    v2.5.3

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

commit 88401c3494ae59af99de7c305140ff4281ae827b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 06:14:54 +0800
Tag:    v2.5.3

Merge branch 'wip-mdl-41843-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 2f334c64645cb624f0d242b04fa9495c6b2d9358
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Oct 2013 05:32:46 +0800
Tag:    v2.5.3

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

commit 5e50cd9355be4b3303a1bde8c75eb94255e4c897
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Oct 2013 03:27:18 +0800
Tag:    v2.5.3

Merge branch 'MDL-42069_25' of https://github.com/appalachianstate/moodle into MOODLE_25_STABLE

commit 46b23b69faba9e6668f3340dca619951715682df
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:56:27 +0800
Tag:    v2.5.3

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

commit a348f55e3fc9ec429e30c06329a4c63958dae79a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Oct 2013 01:53:22 +0800
Tag:    v2.5.3

Merge branch '41997-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 3ee1a66de9c60ef01be9c9f1254fdfd958c8e2ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Oct 2013 21:59:15 +0800
Tag:    v2.5.3

Merge branch 'w40_MDL-41999_m25_userpw' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 69634029f53dc767f415e0eb2d119687a39568e4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 30 Sep 2013 22:01:46 +0800
Tag:    v2.5.3

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

commit d5971d75a1fa263f60e7d1f95d6da19304ec6b49
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 09:10:12 +0800
Tag:    v2.5.3

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

commit a943166fc1854315ef0073e3367c18ff3ca186b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:49:10 +0800
Tag:    v2.5.3

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

commit 8ecd67c48e73b691b77c8866586beb17e303a863
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:13:22 +0800
Tag:    v2.5.3

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

commit 1cf52db9b4b74241143c0bb421be1f4ff5f890b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 08:00:34 +0800
Tag:    v2.5.3

Merge branch '40903-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 4008db6d6aa2b54ed47aeaadedb0b2e5ead3c87a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Sep 2013 05:21:04 +0800
Tag:    v2.5.3

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

commit dd344e37093e48ed9fc18301c1ff43d330e69a94
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:22:42 +0800
Tag:    v2.5.3

Merge branch 'wip-mdl-41717-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 23074741817e01667c9189bb8fee0973b5e80fa1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 03:18:34 +0800
Tag:    v2.5.3

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

commit 9336caebaa0e7cfa7dc5ba5df717729be9748df7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 18 Sep 2013 02:29:59 +0800
Tag:    v2.5.3

Merge branch 'wip-mdl-41711-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 69253612e41e7d4350d52bc48b82f4bd44e6e1f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Sep 2013 08:15:22 +0800
Tag:    v2.5.3

Merge branch 'MDL-41595_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 93e4ea20f20895cb49a2fee3ace554509e338e72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 07 Sep 2013 20:11:59 +0800
Tag:    v2.5.2

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

commit f2900567a8aacbe4597e64fe47d4b00f89910a2a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 04 Sep 2013 04:07:04 +0800
Tag:    v2.5.2

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

commit 247f3e95e7975c8003de49747d8af5bca5738902
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 03 Sep 2013 21:11:41 +0800
Tag:    v2.5.2

Merge branch 'MDL-41568-en_fix-25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 14616c145ff047ff24340522f3e31f52df2cd318
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 03:00:28 +0800
Tag:    v2.5.2

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

commit 19ed5ae02f6089367b677134cab588f429ff031a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Aug 2013 01:46:00 +0800
Tag:    v2.5.2

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

commit 1bb7b654966813b04cda65348ba5774a3824e459
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:21:09 +0800
Tag:    v2.5.2

Merge branch 'w30_MDL-40679_m25_zlib' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit d03c0ef72d3e6b9ca40c069600116b1bf0c8a379
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:19:32 +0800
Tag:    v2.5.2

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

commit c8dd490281ae6d8881a1b44f03e7f8d0a1b3be3b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Jul 2013 00:01:19 +0800
Tag:    v2.5.2

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

commit 52affa8a9a888efe4f5b7b5e2f093af313623a1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:58:30 +0800
Tag:    v2.5.2

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

commit e988493e68461b1e1bfc0fcc222e2b32dc3e4411
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 19:19:54 +0800
Tag:    v2.5.2

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

commit 932ad50a6ef395cbdf9247c08677ea21d6200dbf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 09:52:23 +0800
Tag:    v2.5.2

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

commit 2f956f40b6a79ed57149ab13da1af19c8db52e98
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 07:09:20 +0800
Tag:    v2.5.2

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

commit e024b7130afe7433e7cf26d1749630d493a6bd46
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 06:45:20 +0800
Tag:    v2.5.2

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

commit ed3a28dcecd483ed32538798bfeb96d91c3d38d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Jul 2013 04:36:33 +0800
Tag:    v2.5.2

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

commit 55be97fba49cb9adbe6247e9f4c21c229aa72445
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 22 Jul 2013 23:41:01 +0800
Tag:    v2.5.2

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

commit b5d967cb1defa01eb26b34b406eebf7698309a26
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:41:19 +0800
Tag:    v2.5.2

Merge branch 'MDL-40652_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit c59f83cec25e62cf0564a7dbb7147e14962e73a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:32:37 +0800
Tag:    v2.5.2

Merge branch 'w29_MDL-40611_m25_accesslibtest' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit cbd227ffae92511dac0dada922e06d719dbaea0a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:26:43 +0800
Tag:    v2.5.2

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

commit bc27ec579e036bd89d7e8252d0b08376a095f8fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 06:17:43 +0800
Tag:    v2.5.2

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

commit 980746ce63ea1e6c8545d1f37e96b61c0c1bb521
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 04:02:23 +0800
Tag:    v2.5.2

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

commit 2ff8b13dee0b3d8ee860366991eff3790853b101
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Jul 2013 03:55:55 +0800
Tag:    v2.5.2

Merge branch 'w29_MDL-40423_m25_localsubdir' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit aeee792c86a2ef29d3f0dd85c5cfb7449b1aca54
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 15:46:27 +0800
Tag:    v2.5.2

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

commit ed405efb4c686e7d80fe0732e30d763fddff6e90
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 06:26:51 +0800
Tag:    v2.5.2

Merge branch 'w29_MDL-40571_m25_adminblocks' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 40aa1f4d88a75090de41a597c2028143c6a0f624
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Jul 2013 04:08:09 +0800
Tag:    v2.5.2

Merge branch 'MDL-40412_m25' of git://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit ad92b2f1ae60b8496d729ed2bd377fad923b03ef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Jul 2013 23:06:31 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-38747-MOODLE_25_STABLE' of https://github.com/satrun77/moodle into MOODLE_25_STABLE

commit 1a5986dab9ffc3e3d17539d47e9bcc4d2dab70c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 03:12:10 +0800
Tag:    v2.5.1

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

commit a9155c2875adeada1bc4680bcb89f8d1d00facf1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 20:27:24 +0800
Tag:    v2.5.1

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

commit 4d52fbbc143eb03851c1fe121eb1446a53851156
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 19:47:37 +0800
Tag:    v2.5.1

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

commit f1293083a2f4f6970baa6a4221b5d9844b303877
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 06:46:38 +0800
Tag:    v2.5.1

Merge branch 'get_users_by_capability_fix_m25' of http://github.com/timgus/moodle into MOODLE_25_STABLE

commit 2bc8f2160018810e57bc3e4f758ed7576d8eb08a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 05:14:05 +0800
Tag:    v2.5.1

Merge branch 'w27_MDL-39754_m25_evn26' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 75b8d4a1465e2f1178ffdc9a824ec0e573ab5a1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 00:02:32 +0800
Tag:    v2.5.1

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

commit 97a7b6a7aa985b2ec77fc944837f970cf3f7fe48
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Jun 2013 02:05:10 +0800
Tag:    v2.5.1

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

commit 866ab6e1ce0834062b2a2b6f86b2ce08e4001fb3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Jun 2013 18:30:51 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-39701_m25_filterupgrade' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 3166c21471751e5d7eb4ead30f12f4ad931d6f40
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 18:08:25 +0800
Tag:    v2.5.1

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

commit e9d80e664b9f1c0e629e57eed4237a9d0bc9ae79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:29:13 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-40233_m25_frontset' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit ffc480afbd60d4851cbeff1f69da8db5d3f7a0ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:23:43 +0800
Tag:    v2.5.1

Merge branch 'MDL-40264-m25-essay-zero' of git://github.com/ktemkin/moodle into MOODLE_25_STABLE

commit 3d4a0f28875a3094c1e032fcd9c820c6bb677da0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:13:06 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-40254_m25_flatfile' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 9067595bf315d3b7887ba890817d73d2ead0cdb8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 02:21:30 +0800
Tag:    v2.5.1

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

commit 94a541f7ff8fcc38548a9d2b3c54e24745f4362b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:26:22 +0800
Tag:    v2.5.1

Merge branch 'MDL-40255_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 3e6f11b240b3e607edfae40aec50863bc533483b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:00:43 +0800
Tag:    v2.5.1

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

commit 5e069cbd969540ce5c1100f515c1a9d657b5dc58
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 07:45:27 +0800
Tag:    v2.5.1

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

commit 5cc26839e79d05735371e952a0cb3d1365195242
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:56:11 +0800
Tag:    v2.5.1

Merge branch 'w25_MDL-40210_m25_badgescaps' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit a831f154aed9764d50d2273360a99a12587f9ca6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:44:17 +0800
Tag:    v2.5.1

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

commit 61899ac202f9dbbe07d198385c5321b54b122b08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Jun 2013 01:32:14 +0800
Tag:    v2.5.1

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

commit 92c46e00eb10fa0ec0c5b5c61aee98bac60716a2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 22:24:22 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39588_m25_ociinstall' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 1127607bce385db74de59487fb24668dbbe800ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 22:18:01 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39503_m25_signup' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit ef580461f69a77b356151f9eb25e0ef40449bf30
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 16:36:22 +0800
Tag:    v2.5.1

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

commit ea85ee6f63410042cab5cbe62e0cabf76a593d64
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:43:48 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39416_m25_pagelog' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 832aa7eb718b08bcdd56fc2f9f5175edc59455c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:30:56 +0800
Tag:    v2.5.1

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

commit 0e73df9df61e7d3c2a43598d5ef0770af0279207
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:27:35 +0800
Tag:    v2.5.1

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

commit ef8a1c4908995aa9b224f7efd52c817db4b1acf8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 07:45:28 +0800
Tag:    v2.5.1

Merge branch 'MDL-39790_master' of git://github.com/totara/openbadges into MOODLE_25_STABLE

commit 0f51a82bae7faab933612d14983583dff64c7b1c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 07:43:11 +0800
Tag:    v2.5.1

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

commit 8c8b3eba2479e99a69a07ca77487d5954584dd49
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 23:48:57 +0800
Tag:    v2.5.1

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

commit 1fe7be205c5b3e9f0aa3bc7216cbc4988a5936c0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:58:27 +0800
Tag:    v2.5.1

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

commit 8a2cee5091bc5f3874ae436baa1b8e08b0dfc2a7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:43:28 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39764_M25_3' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit ca7f399be73d5f2170272711d227680de6d5ce87
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:32:12 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39882_m25_behatconfig' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 618737d7e9e532596a00825d38fb4352d69e1cc4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 06:05:04 +0800
Tag:    v2.5.1

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

commit 06ab9b88886cfb8671bb3460046b1b5ae71ca97b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 06:00:44 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39465_m25_environment' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 73f8ab649f9f8a5d90e23c17464e7427116aea24
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:22:17 +0800
Tag:    v2.5.1

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

commit 189590bb37854c1d8593d699314cc8ac09912532
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 01:10:39 +0800
Tag:    v2.5.1

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

commit 42a9e3efc2f0ef8e9d1a726e2d34e3e4ad597a68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Jun 2013 22:07:47 +0800
Tag:    v2.5.1

Merge branch 'MDL-39987_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 4bc4844d5bf1f1885454bf7854ab935b0184daa9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 21:33:33 +0800
Tag:    v2.5.1

Merge branch 'w22_MDL-39676_m25_whereparam' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit e58af1dfcdc2d88c0255c2554e924c674db9d0d6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 07:24:58 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39836_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit 4f0d6118ffc39f3eca143ef2c3665da2d8b40781
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 07:02:34 +0800
Tag:    v2.5.1

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

commit 8b77e812016cef3eb4846dbbe9558dbbeed4372e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 06:57:06 +0800
Tag:    v2.5.1

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

commit d6e2b0a03e2142ac317fb6c871e43aa9d5aa6760
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 06:45:02 +0800
Tag:    v2.5.1

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

commit ab6a0ac4f7fca18c7f82c76fcd6267e537f49757
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 07:48:38 +0800
Tag:    v2.5.1

Merge branch 'MDL-39758_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit e3c1bd25935c5e748a5a29a9c6c3895e2bee4734
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 06:44:22 +0800
Tag:    v2.5.1

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

commit ff291e488d6c87d631db47dfa3e36a9c8f05a668
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 May 2013 17:18:14 +0800
Tag:    v2.5.0

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 522b5faf606706e2788d1fdcff2a761ec62c715a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 13 May 2013 18:07:55 +0800
Tag:    v2.5.0

Merge branch 'MDL-39642-en_fix' of git://github.com/mudrd8mz/moodle

commit 3e81c83e68aca08478b3bf991c4904d1f2ae5f4b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 23:17:43 +0800
Tag:    v2.5.0-rc1

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 6382f49fb19bba466c057fe5089e8762e8154c7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 19:17:16 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39518-master' of git://github.com/damyon/moodle

commit 9d5ec394537dd38a154858d831ce8cab85f5ad18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 18:06:38 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39575-m25' of git://github.com/samhemelryk/moodle

commit da2cff35c508406fb058dcd8acb401e39073f325
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 09:16:09 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38885-master-int' of git://github.com/FMCorz/moodle

commit 05bf4b17e8b2e16338a101c8c0875678e440a791
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 08:53:49 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-29758' of git://github.com/jmvedrine/moodle

commit 7942df199beb7dfc2106af042321a09c9d4504a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 08:37:54 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38559-completion-ui' of git://github.com/mudrd8mz/moodle

commit ab0cb7cde6fd651ca634f2bda86d20c3a96dec78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 08:36:30 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39003-master' of git://github.com/damyon/moodle

commit 1065589db1a4c0dad35e51d3f0bb8ec819cda5ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 08:31:50 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39586_master' of git://github.com/dmonllao/moodle

commit dd334c7a8b0950cf0d118ccfae08dee2e0a35308
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 07:42:19 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39051_master' of git://github.com/dmonllao/moodle

commit b87572e860b3b1d2f9626da80561c22f6ecaf6b7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 May 2013 04:18:58 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39424-master' of git://github.com/ds125v/moodle

commit d560159df64c3861cf3951f40d652843a3dd79f1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 21:47:38 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39488' of git://github.com/rwijaya/moodle

commit 6d0e18efe8b0f3562bab533255ad8eda80feadf3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 19:39:54 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39585-filters-upgrade' of git://github.com/mudrd8mz/moodle

commit 919a8db0a26da1b96b236bfef111712aaea5e1a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 06:35:28 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39463_master' of https://github.com/markn86/moodle

commit 474e0d3cd20ae9a754f937ae3136fd4b5ed2ae3a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 09 May 2013 06:20:06 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39397_master' of git://github.com/totara/openbadges

commit fc99ef7ebb75896720c3d170f69d8e9fb5dd5082
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 16:30:25 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38532_master' of git://github.com/dmonllao/moodle

commit 2fd46e12b8db398d55009f30e531e1609ad39165
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 08:14:20 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39554-m25' of git://github.com/samhemelryk/moodle

commit 4ce97aed0d48514781f0d16cc069b8a7b5e1a67f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 06:28:15 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-mdl-39332' of git://github.com/rajeshtaneja/moodle

commit d40a24384e5a1a5d238ce7a8f86c212444a940bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 04:06:04 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39452-master' of git://github.com/sammarshallou/moodle

commit fbd84c8eb5cd4e676d8562d2e68c59db1a49d90c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 03:57:40 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-32301_lti_instructor_params' of https://github.com/moodlerooms/moodle

commit 5304ded836257af4e49f36a2ceca7dfeb26bc2c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 03:38:24 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39538-master' of git://github.com/marinaglancy/moodle

commit 52933ab0871fdc1a42e956c0378dd87e4f536acc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 03:28:09 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39525-m25' of git://github.com/samhemelryk/moodle

commit 3705a6dcbe14484146cb9814e7ef1abe8ec884f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 May 2013 01:15:21 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-34275-master' of git://github.com/danpoltawski/moodle

commit 5b003e9cddc41c2a46969f5b610bc16220d39f79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 07 May 2013 23:52:00 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39478_master' of git://github.com/dmonllao/moodle

commit fc076898c79035be3c6a71f952ce4d3134808c21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 07 May 2013 21:50:29 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39437' of git://github.com/rwijaya/moodle

commit 4d71661e2bb7adbfcfea621980271ef66a408a17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 07 May 2013 09:00:02 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-37500-m25' of git://github.com/samhemelryk/moodle

commit fc17f7568417b27002412ddc7341909da3f39bf9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 06 May 2013 22:50:30 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38041_master-fix' of git://github.com/dmonllao/moodle

commit 081bfdc5fff23b2c1eedcbfb35d49e1a7006d405
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 06 May 2013 07:49:51 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39348_master' of git://github.com/dmonllao/moodle

commit 07c9a6db961b6c245feecdb43aa0e262150f4e86
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 06 May 2013 07:23:49 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38041_master' of git://github.com/dmonllao/moodle

commit e7ff753cab0762232fceb4b3b2e67315c6e08a97
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 02 May 2013 09:33:35 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39432-m25-i' of git://github.com/samhemelryk/moodle

commit 2f679b426ad6bcb10f04cf3d960256a124f90186
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 22:55:36 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39444' of git://github.com/timhunt/moodle

commit bee592add8e856391972618e07c064ea5ac512d6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 08:29:36 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39216-m25' of git://github.com/samhemelryk/moodle

commit 6fc48952760ce3c5261687d3dd4ea37e5116c92d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 07:33:18 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39432-m25' of git://github.com/samhemelryk/moodle

commit 6a222aa127fc3cb10827cd1ce49f1b5f560d4a1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 May 2013 06:47:32 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39232_master' of git://github.com/dmonllao/moodle

commit a86103e09bb5f0439ab0f5cf468b829b246d05aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 26 Apr 2013 17:10:09 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle

commit e4a7816155ff3276a51ab65cfc4d9ea1e406df4a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 26 Apr 2013 16:48:38 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38888-master' of git://github.com/mouneyrac/moodle

commit 29b8b7e11ae10b2d389a9c3be911b9c0e4b6fa7d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 26 Apr 2013 05:50:08 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39358-standard-clean' of git://github.com/mudrd8mz/moodle

commit 344c04e0ffcb3662b848da7396617b862986639d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 07:02:41 +0800
Tag:    v2.5.0-rc1

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit ac8b3d845eb853ca08ce90130dc5d2b72eaf3e68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 06:27:03 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39276_clean' of git://github.com/lazydaisy/moodle

commit 4017b1f76a9a7b4bd330b0825070ca4811aa47cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 06:00:23 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39138-master' of git://github.com/ds125v/moodle

commit 274511f0cbfe5c6748f14be26c126b3c5c7b754f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Apr 2013 05:35:46 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-35364' of git://github.com/timhunt/moodle

commit 01159be8de181c4ce7b6268709dcdb736ae67ab4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Apr 2013 08:02:20 +0800
Tag:    v2.5.0-rc1

Merge branch 'w16_MDL-38972_m25_oraindex' of git://github.com/skodak/moodle

commit bdeda339b45a0a54072484378f165f16541ee714
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Apr 2013 05:41:47 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-38441-m25' of git://github.com/samhemelryk/moodle

commit b279f334101f12d157504c948f60d9f452cb523a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 18:50:50 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38956_master' of git://github.com/dmonllao/moodle

commit 9b81eef05d9b1d30df73dfa2a7e9aee58c1e5f39
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 08:43:49 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-39052_m25_csvtemp' of git://github.com/skodak/moodle

commit d10d607e8c7425b0260340c92194c35a969b6f33
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 08:01:16 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39151-master' of git://github.com/FMCorz/moodle

commit a821c10b868fa5ed0bd26987716bfc6d4892722e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:55:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-39069_m25_helpwindow' of git://github.com/skodak/moodle

commit 4ec465b1555bb65dbe4a2e63b667762ef587a8d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:40:51 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38100-master' of git://github.com/FMCorz/moodle

commit e377d867651e3c3c43b1233ed22b747b14391166
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:36:43 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39066-master' of git://github.com/ankitagarwal/moodle

commit 9004d7a51cfaca376f168dc95ecfd8c9ca27a9a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:27:39 +0800
Tag:    v2.5.0-rc1

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

commit 91560510dc60ef4b5b1a678d7c6aec8aefbaf6f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:06:17 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-39129_m25_afterburner' of git://github.com/skodak/moodle

commit 359c1d47566c08470578c432718e10b3baadd584
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 07:03:27 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-39075_m25_userdesc' of git://github.com/skodak/moodle

commit 3536896e2503c58ff5f005cf97365aa92a5cee07
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Apr 2013 05:50:19 +0800
Tag:    v2.5.0-rc1

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

commit e32a8ae83279d2ee8553ff717fd6ef9f16f252a9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Apr 2013 08:07:15 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-39132_m25_badgesettings' of git://github.com/skodak/moodle

commit 718995ee30041798b19a35b8b807263383a6f71a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Apr 2013 07:24:33 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39127-m25-integration' of git://github.com/samhemelryk/moodle

commit 4af6e51309bbf1b8c9273571966fb5437fed3ef6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Apr 2013 07:14:06 +0800
Tag:    v2.5.0-rc1

Merge branch 'master_MDL-37844' of git://github.com/danmarsden/moodle

commit b4f93903a72c9e30ed0decab8cbe733b1218e9a2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 08:33:17 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38617_master' of git://github.com/dmonllao/moodle

commit 35bff0716d84c50cb1ade833bed56dfb281bdb7f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 08:22:23 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38947_master' of git://github.com/dmonllao/moodle

commit ef6fbe9eef97fbb1f34ca636c9a86d73c46280be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 08:22:06 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38948_master' of git://github.com/dmonllao/moodle

commit e9324d0863db5043a03d0213b6e5e787c075d0ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 08:19:58 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38949_master' of git://github.com/dmonllao/moodle

commit 252612a6700a7d489c75c277b3ea23fb1c0e2414
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 08:08:35 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38962_master' of git://github.com/dmonllao/moodle

commit 068fc30fa57af3771d8f71630634ae450e00ee99
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 07:59:21 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38960_master' of git://github.com/dmonllao/moodle

commit 7fc82aec495ff4a23d9aba5d323fbb13ef713186
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Apr 2013 07:57:01 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39089_master' of git://github.com/dmonllao/moodle

commit 2f587fb334f178161200971239d132d2ca663ede
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 22:44:47 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38828_master' of git://github.com/dmonllao/moodle

commit 2087fa6223332b0b6602ab348f8eb95c0f6629f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 22:32:32 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38961_master' of git://github.com/dmonllao/moodle

commit bd3d4c9e8d60dd2667f66924b370f913ae152686
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 22:30:08 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38963_master' of git://github.com/dmonllao/moodle

commit 33fcbe89d4eef4f409f3f2359be2c591d457aa16
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 22:11:40 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38940_master' of git://github.com/dmonllao/moodle

commit c51e1fa37e9a388740f0fc8757e7d13a30b62b56
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 21:56:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38957_master' of git://github.com/dmonllao/moodle

commit e9bcf8019b1f647208dc6002ff7c9e3d68efe4ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 21:52:53 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38958_master' of git://github.com/dmonllao/moodle

commit f6cec2fd62f56626198d5616eb0ef819d0eeeeb5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 18:32:32 +0800
Tag:    v2.5.0-rc1

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit e592ccd860cb72804e1fc5b413d86751a35c96db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 06:56:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38525-master' of https://github.com/damyon/moodle

commit 2e140437b14a44921bb1c1184d8ac3c7ea9c8a64
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 06:43:59 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38937_master' of git://github.com/dmonllao/moodle

commit 2cef0f7c333e007109d9a97a8e54bd1da24c8ecd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 06:32:40 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38939_master' of git://github.com/dmonllao/moodle

commit a7ed1eca089df32073643d8a7feb67d11ba54824
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Apr 2013 06:22:42 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38970_master' of git://github.com/dmonllao/moodle

commit b812305ef65416b5b9b3302e20b764c7aa080715
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 21:45:16 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-38989_m25_ttfinal' of git://github.com/skodak/moodle

commit e6c7a5887b85f2df0ef19ab2d573de542954258e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:43:46 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38938_master' of git://github.com/dmonllao/moodle

commit 36216331942b0a075746284bead2f39b50e4c27d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:42:59 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38950_master' of git://github.com/dmonllao/moodle

commit 8516f270c612aa3f9cb653a9f0230fac8954878f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:30:43 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38954_master' of git://github.com/dmonllao/moodle

commit 696facb159bc463c62e3a4a9cc5f4a431ffbafe1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:30:30 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38952_master' of git://github.com/dmonllao/moodle

commit b8968449428c02d0e5b48c175efde72b030f4976
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:29:59 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38953_master' of git://github.com/dmonllao/moodle

commit 5bd80500f2125137cbb33b95fdbd073ee60bc7e1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:13:44 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38942_master' of git://github.com/dmonllao/moodle

commit d2f77303b0c5e2d6250cbb57005a663c3820bcb4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:13:32 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38969_master' of git://github.com/dmonllao/moodle

commit a9aa326ea9e22ea8f9bb117b2decd64186769599
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 05:13:21 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38967_master' of git://github.com/dmonllao/moodle

commit 6bb78aedee65dd8467be140b308ec57bf0310d2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 02:24:17 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38945_master' of git://github.com/dmonllao/moodle

commit d06700cbd6fdbaad3b3b90c1de1ace6a4b497243
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 02:23:38 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38944_master' of git://github.com/dmonllao/moodle

commit f7f8ca2420e1de284674ea1fd73c605df3113d1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 02:22:59 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38943_master' of git://github.com/dmonllao/moodle

commit a2027b873b75a16ae04b07ca35c16050e715dbfa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 02:00:34 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38822_master' of git://github.com/dmonllao/moodle

commit c1fc4ba397c38fa0941cb4b2cc04c9d35bc59227
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 01:59:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38820_master' of git://github.com/dmonllao/moodle

commit 26b7bea2c05ad452275c49c602b843442f3862e4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 01:55:29 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39012_master' of git://github.com/dmonllao/moodle

commit 275c2c9f8a3abea85e17bc8f1a2900b557ab4ddf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Apr 2013 01:40:39 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38965_master' of git://github.com/dmonllao/moodle

commit 441b165c12ac1b45849100b5ff41c4ee14e8240e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 23:36:57 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39056-download-api-version' of git://github.com/mudrd8mz/moodle

commit f57832826bab6674f4a55cda818014b8bf7015c5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 20:33:31 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38792' of https://github.com/ppichet/moodle

commit dba85495c11f0a2c2b6033a535b4fa9db0e2f556
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:47:51 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38934-master' of git://github.com/danpoltawski/moodle

commit 552f00fb8621c077457b2cada154e1a0db6402c5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:26:49 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-38750_m25_ocierrors' of git://github.com/skodak/moodle

commit e934648d075b80b52c49c0a36fa991541a5a88a9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:25:12 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-38753_m25_ocicount' of git://github.com/skodak/moodle

commit 13af1f0497ef285fbc6ee9bf9d7abcfdf8e24081
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:23:36 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39038_m25_oracleconcat' of git://github.com/skodak/moodle

commit cf42eece55bdf107a2c2a3cc2333d86c879d5cad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:19:41 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39027_m25_sqlsrvdatatype' of git://github.com/skodak/moodle

commit 6afbf283defe6574c23cd49259b88220c08ed83f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:17:56 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39028_m25_sqlsrconcat' of git://github.com/skodak/moodle

commit 187afd0f528b79bf53fbb437bf0408d9d1b7cdde
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 08:01:04 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39019_m25_mssqldatatype' of git://github.com/skodak/moodle

commit a035bc9b6d1c5f79bdb74aa8ccc633a5f31fa9ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:58:20 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39024_m25_mssqlseek' of git://github.com/skodak/moodle

commit ce2cd4490839e00502e545cf4004dca4789cf786
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:53:57 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-39022_m25_mssqlconcat' of git://github.com/skodak/moodle

commit 60f9cae763958b543a3cb9c3f3836a0692828606
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:44:58 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38618_master' of git://github.com/dmonllao/moodle

commit 70273fb6ae84ca8d5f294e601f718f8ba52fefeb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:36:20 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38912' of git://github.com/timhunt/moodle

commit 196bd8c88525e0ef658ee5c64b09d415a573be75
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:32:35 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-38786_m25_yui391' of git://github.com/skodak/moodle

commit de0fc867adbb880c18c232b119a1a33706681d6a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:24:08 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-34222_m25_simplepie131' of git://github.com/skodak/moodle

commit b19e8a1fb9398e16e2661a5253e79c00f6091047
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 07:13:57 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38744-master' of git://github.com/danpoltawski/moodle

commit d29afc45779e5bb7b118d8008cad2d746940f984
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 06:58:02 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38907-master' of git://github.com/damyon/moodle

commit 5df002ad6874487075f440af843aca9604b0d16f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Apr 2013 06:52:27 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38849' of git://github.com/timhunt/moodle

commit 5a0443cc14d75dd71270d9d013c96f7166e0910d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 08 Apr 2013 22:57:38 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39023-parentlang' of git://github.com/mudrd8mz/moodle

commit 577173a51ff03367f137b990eed0a4958ad1020f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Apr 2013 09:21:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38897-master' of git://github.com/danpoltawski/moodle

commit c5f4080a1051a54bf1418ff4a6c63582d31441be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Apr 2013 08:51:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38852-master' of git://github.com/danpoltawski/moodle

commit dbc5692fc5a748c0f214773c8efc72b246eebc8f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Apr 2013 08:48:37 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38883-master' of git://github.com/danpoltawski/moodle

commit 8f3885f23d051632ef12b8b7fbe79aa3f095e582
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Apr 2013 08:46:15 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38886-master' of git://github.com/danpoltawski/moodle

commit c001c51a2634b0334d2d392437ab48a827f2bd49
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 22:59:34 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36570' of git://github.com/colchambers/moodle

commit 0c7ad0ab13cba0be855f201a481862c3eccde13c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 07:15:34 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38612-master-int' of git://github.com/FMCorz/moodle

commit 1b882ab87b8df8550275d2b80ceb8c205c75fdc8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 07:14:36 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38590-master-int' of git://github.com/FMCorz/moodle

commit 33871fbf3efcfca4a1fc7c17a359bd4a3b962797
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 07:07:23 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38751-master' of git://github.com/FMCorz/moodle

commit 5c98b64b00f0cbe6e017c9c7d88e7ec1d12d3ddf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 07:04:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38666-m' of git://github.com/andrewnicols/moodle

commit 235fc2562cbcd7aa76b6328f48d56eb59e0fb227
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 07:02:20 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38667-m' of git://github.com/andrewnicols/moodle

commit a37a6984174b1727396147abf5795773630a2b7e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 06:53:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38611-master-int' of git://github.com/FMCorz/moodle

commit 75fb3832604a33974afb0c77dab865ff71ede99b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 06:51:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38599-master-int' of git://github.com/FMCorz/moodle

commit 68a6d3cd9ffbf945d2d0fba542ea55c7b8e7109f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 06:34:24 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38645-master' of git://github.com/FMCorz/moodle

commit 76d86181a36095aebe98884338961674f8f7505c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 05:45:40 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-38494' of git://github.com/rajeshtaneja/moodle

commit 1ca5ce1b33f0cc822aa38ebd9867cf08367827c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 05:09:19 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36570' of git://github.com/timhunt/moodle

commit 896efbeadb33b37dd0d971eb0b82a437eac86b1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 03:59:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38756-m' of git://github.com/andrewnicols/moodle

commit 0e864c3f213e06e374307a4ce276658c490728f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 02:06:49 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38733-workshop-rubric-css' of git://github.com/mudrd8mz/moodle

commit 2a5e0d6321a8f4c5b9363d4410f3369126dc92a2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 04 Apr 2013 01:48:02 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38815_master' of git://github.com/dmonllao/moodle

commit 7191a59fc9d5e8f66511648edc501bbd60a68f8a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 23:12:04 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38615_master' of git://github.com/dmonllao/moodle

commit 6b117438b92febcd107e26f24417482b1ff9cbbb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 22:48:42 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38482_master' of git://github.com/dmonllao/moodle

commit 57902e2738a917778ed7a17a6030675c46a5b202
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 19:33:16 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle

commit c9f8620492ebc0c823f52291c079cd57803a83ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 19:20:23 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-26956' of git://github.com/timhunt/moodle

commit 636376947c04ef154fe29a616f45d3a33799cfeb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 09:17:08 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38738-master' of git://github.com/danpoltawski/moodle

commit a2f667472e18d3e8da5f4a89b58abf24dd0cb4be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 03:06:21 +0800
Tag:    v2.5.0-beta

Merge branch 'm25_MDL-38790_Missing_setType_in_My_private_files_form' of https://github.com/scara/moodle

commit 991dcb1b820bfd6135962a7d14ae8e74ca7b9637
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 03:01:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38690_master' of git://github.com/dmonllao/moodle

commit d3f422bdc177df001afc490338a89c117093a602
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 02:46:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38687_master' of git://github.com/dmonllao/moodle

commit 80430739d912c30e56777f4965278a2e01630ba3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 02:41:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38785_master' of git://github.com/dmonllao/moodle

commit a534e06e473893a99d730c38859dcac144adb135
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Apr 2013 00:35:41 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38616_master' of git://github.com/dmonllao/moodle

commit 871da25a40a0bb4e6dcee6f84c2d5c54ca9b64bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 21:51:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38622_master' of git://github.com/dmonllao/moodle

commit 7fb5b7fae180c1f9d8a7043c6da16c8b672a7e3c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 21:25:19 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38548_master' of git://github.com/dmonllao/moodle

commit a5efbe6161b219f6b832a1f8e2df3745ecfb7845
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 09:30:30 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38814_master' of git://github.com/dmonllao/moodle

commit 51cae5899874cd500ff84a908c322e96668b3508
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 08:41:44 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38689_master' of git://github.com/dmonllao/moodle

commit d6dc3019b62a6f78a5f6c7465fdb2a7595b6ff39
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 08:41:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38686_master' of git://github.com/dmonllao/moodle

commit 1c49f7ad1986db9b96464bdbb221021a1f2fe910
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 08:41:25 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38688_master' of git://github.com/dmonllao/moodle

commit 342c3f3e6c73f4aabdae61bd8a38a23784149485
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 08:27:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38621_master' of git://github.com/dmonllao/moodle

commit 3e275484317a0a360b7ef9e81e330c06444ff77f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 08:26:54 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38620_master' of git://github.com/dmonllao/moodle

commit 12879418e98121d91ea5e9b77349d066e25f67ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:47:40 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38823_master' of git://github.com/dmonllao/moodle

commit 23726a43d48ff6657b6ecf53ffb8c8ff186751bb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:45:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38805_master' of git://github.com/dmonllao/moodle

commit cd4c7e9af40e2931c8b362ff4017bb9781d67964
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:44:59 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38804_master' of git://github.com/dmonllao/moodle

commit 0f8fd3a7eb5d918e477b07381173a01208a2794a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:06:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38477_master' of git://github.com/dmonllao/moodle

commit 2bb24f16e097a16a489a8a24877916c742f76b11
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:06:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38476_master' of git://github.com/dmonllao/moodle

commit 55a2081d2832193cc9db54a61f83321a402465bf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:04:44 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38475_master' of git://github.com/dmonllao/moodle

commit c1bccc8ef53839f1611076aee7dcfec58e28399f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:04:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38439_master' of git://github.com/dmonllao/moodle

commit 9f0700fb6caae3b72a6b98a3de24d674beb0d1ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 07:03:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38437_master' of git://github.com/dmonllao/moodle

commit 54e48dc32d8c5dd1ebfe78fc5d4200202ed9fc0d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 04:32:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38547_master' of git://github.com/dmonllao/moodle

commit c57c57c575ef77061426595c9c1699e3991e1eed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 04:23:58 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38499_master' of git://github.com/dmonllao/moodle

commit 0251a625004e77e319331fbcee64459f1fad7cb2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Apr 2013 04:17:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38486_master' of git://github.com/dmonllao/moodle

commit d4a5896f8a21ddf7717bf99321fd0128b862046c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Apr 2013 19:25:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38817_master' of git://github.com/dmonllao/moodle

commit 68adfee6d453603f0e08b1fabeeba5f69df8a434
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Apr 2013 19:17:20 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle

commit b216376811557c3561e2a3aabde6e3922994a49f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Apr 2013 19:12:08 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38787_master' of git://github.com/dmonllao/moodle

commit 50206449b62680db4688dc11ed05962f7bb40b55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 06:56:57 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38516-m' of https://github.com/andrewnicols/moodle

commit 113f9a68bdfa7b8f9b8f8104615688b0fac49409
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 06:38:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38520-m' of https://github.com/andrewnicols/moodle

commit 9b79c017f92b7462a45c87c4e4471d4e5527bbda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 06:20:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38473-m' of https://github.com/andrewnicols/moodle

commit 59549129b1d8fb0876afa4843f5f012428aec89c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 06:06:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle

commit f3804a0c00f46bf330be50fb02531f9c15a268b2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 05:42:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38472-m' of https://github.com/andrewnicols/moodle

commit cb39c6136b862857c8e2310d827355985048379f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 05:29:21 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38519-m' of https://github.com/andrewnicols/moodle

commit c4b39661b9f704b44fdcc166d9018a44f8352133
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 04:43:30 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38517-m' of https://github.com/andrewnicols/moodle

commit a8cdbbe053740ce0f75a8b37a67ea491be67f176
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Mar 2013 01:50:34 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38471-m' of https://github.com/andrewnicols/moodle

commit 3b597dd4ee91e42d14b56d5d3f5955445e9f6d2a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 09:00:02 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-38543' of git://github.com/deraadt/moodle

commit 49ef0c56efc1996e8971f9b806f6e69fdebf5774
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 08:51:35 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle

commit 381ffd46fc89c724828d4721298be465f0b47d9d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 08:49:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38566-master' of git://github.com/FMCorz/moodle

commit 18ceea60afa4c4c8d5a30c4852aa121db36f905c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 07:47:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38484_master' of git://github.com/dmonllao/moodle

commit 2477bb29cc102b51c5b656472f2f6b0f14a5e16d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 07:46:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38531_master' of git://github.com/dmonllao/moodle

commit 64a807ae44d9da315eed9fd1b0061bcd30d616df
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 07:43:19 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38483_master' of git://github.com/dmonllao/moodle

commit cf140de9459a3f98496129aab331f6f06e0aa456
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:38:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38557' of git://github.com/timhunt/moodle

commit b741fac30841606cfbf057b6710898d1f03b1a11
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:27:16 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38651' of git://github.com/timhunt/moodle

commit d89eed6fcac2b35b96b28249326ca0d73fe46b24
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:22:25 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38647' of git://github.com/timhunt/moodle

commit 45679e3a9ec067a4a345a2301650aa986ceecdfe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:14:24 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38589_m25_pear' of git://github.com/skodak/moodle

commit e01812b33337f59f4335fd351edb6f4b69bc4ba0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:13:33 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-37783_m12_testinfo' of git://github.com/skodak/moodle

commit 8ef5dc58ea562e089c376f387b7ac5e8883f26ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:10:11 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38563-master-int' of git://github.com/FMCorz/moodle

commit 4efcfaa3aec5d7ff6398b1e69278b5a48cbf1904
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Mar 2013 06:04:48 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle

commit 2ac738f8ede52de7b642b13eff01ea5f328a0854
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Mar 2013 23:09:06 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-37782_m25_testtrans' of git://github.com/skodak/moodle

commit 0d377c8d565946c11b62ea322f1315104b53f586
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Mar 2013 23:07:12 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38671_m25_adodb' of git://github.com/skodak/moodle

commit cf20e809aabc4a9e6781a4a6a39ef418b32fca65
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Mar 2013 23:03:37 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38582' of git://github.com/timhunt/moodle

commit 38495379a8defc3e596c00109cbf96c00480d2da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Mar 2013 20:37:13 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38719'

commit 5214f9ef96844332c7f58b62a4045762a2426d16
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Mar 2013 06:40:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38658-m' of git://github.com/andrewnicols/moodle

commit 943e317cb40c4cf40422fabdcc454305404c277a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Mar 2013 06:39:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36927-master' of git://github.com/ankitagarwal/moodle

commit 22ddcdef89fec4d779724e12b6b9e51b2224798f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 25 Mar 2013 06:26:55 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38581_m25_forumtests' of git://github.com/skodak/moodle

commit fedcc830162adfd28a8a0146bf3070b9e6a6b012
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 21 Mar 2013 00:06:22 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle

commit cfe6a96f0ad2ff6e7c08eb4c7b1f738eac15c773
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 08:47:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38470-m' of https://github.com/andrewnicols/moodle

commit 99b3e4e7bdb39eae6a3812cd9dc89f463fa78310
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 08:21:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38414-master' of git://github.com/FMCorz/moodle

commit dc1abf2bc4f4510ba19359048325eff5061a5495
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 08:19:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38330-master' of git://github.com/FMCorz/moodle

commit 8b994ec0b9d6480d39483363c8ff7ba683e37f14
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:43:09 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38490' of git://github.com/timhunt/moodle

commit e233dc58ed4907eb372fe24d05cf3f4fee3d4eb5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:34:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38416-master' of git://github.com/FMCorz/moodle

commit b35dd05521b641be1174f29dbb03a127184ddf7c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:30:49 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38370-master' of git://github.com/ankitagarwal/moodle

commit 6a32219c84d36d1869af22e4dc9995a0d323bd04
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:17:35 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38364_m25_phpunitloading' of git://github.com/skodak/moodle

commit 044566f0016dd3984da270cb0ae178886cdea9ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 07:13:51 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38166-m' of git://github.com/andrewnicols/moodle

commit 1d962a1984ca1913b3a2197f8d23219ce13c6604
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:54:27 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle

commit 354ec0691b4b0b98bd8b42aad6dce552a2774c42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:31:21 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37664-master' of https://github.com/lucisgit/moodle

commit e73ac7692eaae562ac4f67e53493196293b0c9cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:27:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38433_master' of git://github.com/dmonllao/moodle

commit 1d790031c2bd10ecd24696c96262a70867d1cd49
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:26:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38411_master' of git://github.com/dmonllao/moodle

commit eb8a3eeaac00a2b7fe8041fad55b7e482968eb76
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:20:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38410_master' of git://github.com/dmonllao/moodle

commit ec05fb8367144fe015caa5fd3c3ecc441dbd8086
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:17:39 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38424_master' of git://github.com/kordan/moodle

commit 85620106df50345f303ef2ab82e6493b154cd56c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:15:04 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38418-master' of git://github.com/FMCorz/moodle

commit 65b5f400b861fb42adf35eadcfb68b184ec23386
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 06:06:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38395' of git://github.com/timhunt/moodle

commit 989b9ab6fb2228d76c6d56548cf51eb5f31874e8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:02:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38363' of git://github.com/timhunt/moodle

commit 28a5cd942daebe9f3266ec8f10252ff24764284b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 04:00:21 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38355' of git://github.com/timhunt/moodle

commit e0e59a0c380ca41fa264760a88a12048db65e307
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 02:15:09 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38558_m25_preupgrade' of git://github.com/skodak/moodle

commit 49ac0c5d6a503fd7c6c1f916517c038f0bf29e08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:47:39 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38388' of git://github.com/jonof/moodle

commit bab8a6724f0df24ab5ec4bd11583e459d94fbe2e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:27:57 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33680-m' of git://github.com/andrewnicols/moodle

commit bf2d2aa983054e7c4869204094a56280d25e58b9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:20:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38412' of git://github.com/timhunt/moodle

commit 4e37889c4124fa825187a2713447a0bcf2666ea9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 01:17:11 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38329_m25_webkit' of git://github.com/skodak/moodle

commit 66f1870701de720c3b42b5764d7096b01aea0728
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 00:58:55 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38180_m25_enrolpics' of git://github.com/skodak/moodle

commit 58b9cd031f46b661b113c4ecd01468ed82c8dfb1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Mar 2013 00:16:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38497-admintree-beforesibling' of git://github.com/mudrd8mz/moodle

commit 83ba845de9f09ffdd8303e16c1661d8b3918d7c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:51:45 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38202_m25_loginas' of git://github.com/skodak/moodle

commit b81d5eab90fd877090d77d4454a5e88d85083dd4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:48:37 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38542' of git://github.com/timhunt/moodle

commit 1e1815bead3ba8e4e5d807464d65bdd912643265
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 23:33:28 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38444' of https://github.com/ppichet/moodle

commit 7c27e34742ad9f737cbe7ab05e63aa24eeefdb78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 20:31:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38507-m' of git://github.com/andrewnicols/moodle

commit 7761a38737c8844f65c0115c944356df16e5062e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 20:22:50 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38319_m25_roleperf' of git://github.com/skodak/moodle

commit 1816c69c3f7f5194daf9bb3be252d2435b533b2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 20:17:51 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38391-m' of git://github.com/andrewnicols/moodle

commit e6307294434120b2093678a7373a818998f38a95
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:51:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38515-m' of git://github.com/andrewnicols/moodle

commit 09fe13d1235deef2e0526e1217b16952fa43570a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:34:45 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38391-m' of git://github.com/andrewnicols/moodle

commit 70ca00653818c8eb5ef1986e5cc34ed23bbe7a86
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 19:28:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38397' of git://github.com/timhunt/moodle

commit 5272b7a70fd078f4d569ac66507b4901beb54805
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 17:24:23 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-38431' of git://github.com/rajeshtaneja/moodle

commit bacd6a6f326dae228530d14ae9f6f61842b41935
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 16:36:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36872-master' of git://github.com/ankitagarwal/moodle

commit 668a62ef808d8f5a73b8e34d790e87e1f4d84f92
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 08:46:11 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38524_master' of git://github.com/dmonllao/moodle

commit 03deed4f750db390f0b1156e942df126c9f737f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Mar 2013 06:56:34 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-36198_m25_yuireset' of git://github.com/skodak/moodle

commit 2a28b5d4adcc2aacdeee4cb3f9858faa75bcfd8d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 08:14:03 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38268-master' of https://github.com/jfilip/moodle

commit 0e5781a7ffd066b13dc046033b632b20e36f9116
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 08:08:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30166-master' of git://github.com/ankitagarwal/moodle

commit 2472cdd305160e0b4cf52d3cb5f7e1174acaf9ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 05:50:32 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-38332' of git://github.com/rajeshtaneja/moodle

commit 63b738a177d1b85d6b72e66e34dbd15e839c1a78
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 23:02:39 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38212' of git://github.com/timhunt/moodle

commit b2ccf75484a696ebf4804c5365ff2957758ce2be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:54:53 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34774' of git://github.com/rwijaya/moodle

commit 8aa0a1423b5de92c24a9425bc97fc1487f8d5b42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:50:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38307_master' of git://github.com/dmonllao/moodle

commit 705d41c895292b89aec658f441a1f90e3c1d4002
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:45:59 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36900-master' of git://github.com/FMCorz/moodle

commit 8ed6ee97a64c8ebd808c06b095a08c9d973c3a5f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:43:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38346_master' of git://github.com/dmonllao/moodle

commit e314a6436e4cc2f95266af900e8342a549647e42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:38:37 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-38382' of git://github.com/rajeshtaneja/moodle

commit bf3a44afbe38d164fd46309768e873e09ce90cc3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:25:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38337' of git://github.com/timhunt/moodle

commit ab7cb04fb842ad2c9c0575761ec5fb265f359c23
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:22:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34818_master' of git://github.com/lazydaisy/moodle

commit 35049887b9f5d9a97ceef41e84b6cad357ca9d31
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:04:04 +0800
Tag:    v2.5.0-beta

Merge branch 'wip_master_mdl-38262' of git://github.com/iarenaza/moodle

commit 3523c45b0cc75077365025d4fb81efaf687bcea7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 23:16:54 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit d79759cef9a1ec320f0ddca665bb62b83a1c6c44
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 18:45:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38352' of git://github.com/danpoltawski/moodle

commit b9f3138dbe8c6d301c9b128c479cca803df6e4aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 01:35:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38173-master' of git://github.com/damyon/moodle

commit 641577eb322416af1eb13b21f713c61ff6605eea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Mar 2013 00:26:37 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38352-en_fix' of git://github.com/mudrd8mz/moodle

commit 69d012938967435537a8d7fc9df90d2c61475f67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 17:36:24 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38311' of git://github.com/timhunt/moodle

commit 4384eea0c9797e38a49bdcf1a4b1555e9e148cdd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 17:31:20 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37958_master-fix' of git://github.com/dmonllao/moodle

commit 9f4da038c828f053073629504ca7397244d58afa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 08:22:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38311' of git://github.com/timhunt/moodle

commit ab1e921c310838aac6ac0b3933d06c7e3119507c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 08:19:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36749-m' of git://github.com/andrewnicols/moodle

commit 88906d068d309b4df6234e5dbd39ed135fe7a629
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 02:28:14 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37958_master' of git://github.com/dmonllao/moodle

commit 8d0a04226326b985493672de0aca9eed016d641f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 02:26:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38327_master' of git://github.com/dmonllao/moodle

commit 9af30e60b55539fb30beddb3275b1a9a02795ee9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Mar 2013 01:12:55 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38252-master' of git://github.com/danpoltawski/moodle

commit af733564f4bfd7447b490f8c645b468d86fcb6af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 23:45:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38119' of git://github.com/timhunt/moodle

commit 4afd580231b8c80a3ff52165a20351bfa7845d56
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 22:43:15 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38271_master' of git://github.com/dmonllao/moodle

commit 86d053490d5705d3caded411557f41aa6549ed71
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 08:27:50 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36215-m25' of git://github.com/samhemelryk/moodle

commit 2b48123b92d89230d07201f1e3977656f9800ef1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 08:21:47 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38300-m25' of git://github.com/samhemelryk/moodle

commit caa5bcea00934ff9f8f261912c4b19f6600b1c86
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 08:08:23 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38247-m25' of git://github.com/samhemelryk/moodle

commit fd0c4855840ba33ae9e32b3101c0e69ab70ccad1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 08:03:26 +0800
Tag:    v2.5.0-beta

Merge branch 'm25_MDL-37515_Notice_when_submitting_change_password_form' of https://github.com/scara/moodle

commit adc4aca4755005b670503651e3445d6c77992a75
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 07:56:24 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37897' of git://github.com/jmvedrine/moodle

commit cdbbd48a66640428317a0b035f3bc873b7bf4788
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 07:48:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38261-workshop-attachments-size' of git://github.com/mudrd8mz/moodle

commit 62bf37d8f52ea3a4001ffdfdd486faacc82dd3b6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 07:46:12 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-37907' of git://github.com/danmarsden/moodle

commit 267325491917da9e6ff27062e8476f967f6b48d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 06:03:46 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-32975-m25' of git://github.com/samhemelryk/moodle

commit 1de87afc243638d0cdd6c72a4708c687d3f22ed1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 03:46:41 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37522-published-attachment' of git://github.com/mudrd8mz/moodle

commit 25ba263d608c8b7f989a9c87a7deaed9b6e24ff2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 03:37:57 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38133-master' of git://github.com/sammarshallou/moodle

commit d03d5e7816dbcbb9f5e4e7f5ada3979e2be45587
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 03:18:48 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-33013-m25' of git://github.com/samhemelryk/moodle

commit 5a341e9183b354edc1cd2ba8d81ee9618cb20405
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 01:08:54 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31390-m' of git://github.com/andrewnicols/moodle

commit 8b0f09d940ec09eef5a2068e89baf87a926f5ac4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Mar 2013 00:59:39 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36380-master' of git://github.com/FMCorz/moodle

commit 266e8dec4918ae97327e2366bfa90cf3ea7f9eef
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 23:42:25 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37983-master' of git://github.com/abgreeve/moodle

commit d5834b37121167b9020c2a9efc1c84203264e669
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 23:25:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38170-master' of git://github.com/sammarshallou/moodle

commit 15d427c82d82679768b32f983a2e0c7a27cea353
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 10:01:11 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38205-m25' of git://github.com/samhemelryk/moodle

commit 52f0c094f539c651632e2a5d16d8f9c417f395ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Mar 2013 06:07:05 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38165-m25' of git://github.com/samhemelryk/moodle

commit 5524bab53d92edd167ad487d6d4718d8c17334a7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 28 Feb 2013 22:40:15 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 738b0965a4968de76226a5ba2abe0027c2504d7e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Feb 2013 01:12:15 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37356-master' of git://github.com/abgreeve/moodle

commit 2c4293ce906c5384a3ef7e6a177061cb04a0d57a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 20:23:34 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-31885-smartcache' of git://github.com/marinaglancy/moodle

commit 36650d6f516c3a4b179b58077cc3f99741348c81
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 17:14:28 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38076-master' of git://github.com/FMCorz/moodle

commit 46e120c561c4239ae715475e10efbb148abbc43a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 17:06:14 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37835-master' of git://github.com/damyon/moodle

commit 9515c34ee683a6d62c1c8060000734d60c59820f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 16:46:13 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-30669-master' of git://github.com/abgreeve/moodle

commit fd6e1aaadbbe27b0a8797f5a3ad7f09e12e9f6ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 08:28:56 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38162-m25' of git://github.com/samhemelryk/moodle

commit 64870338c44fa25bb3816bd212f10629703702d9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 08:25:58 +0800
Tag:    v2.5.0-beta

Merge branch 'w08_MDL-37963_m25_usergen' of git://github.com/skodak/moodle

commit b1ed9f69703432170dcc63d6afddf31b4339d87e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 08:19:29 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38141-m' of git://github.com/andrewnicols/moodle

commit c45593c6d8911babdae00a90080bfd5c3a915e83
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 07:48:22 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38110-m25' of git://github.com/samhemelryk/moodle

commit 1e171d4d37c7c51692d172cb06b3073e9004e1af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 07:33:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38090-m' of git://github.com/andrewnicols/moodle

commit 2a80528fd6d67dcb1574c04d2324e45f63a32abf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 06:52:20 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38146-master' of git://github.com/marinaglancy/moodle

commit 8615b484b217d80759596905a5b025617a261b9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 06:51:20 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38001-master' of git://github.com/mouneyrac/moodle

commit 05fc7ccc8278ac3728a986a7437fbae94fbd79ec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Feb 2013 06:38:20 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30098_master' of git://github.com/markn86/moodle

commit 349c224817566ef8aac2a19e56315eb28fee1759
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:48:12 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37224-m25' of git://github.com/samhemelryk/moodle

commit ca1774aea40ab81fde8441da1be648e58d5312d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:45:50 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-34298-m25' of git://github.com/samhemelryk/moodle

commit b70a3b7106e2db6d01074e18ad229e7d20414e13
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:44:54 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38093' of git://github.com/timhunt/moodle

commit f1b011d3a871acd46e793dbd2ac733b0a609a4aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:39:44 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37894' of git://github.com/timhunt/moodle

commit d2761b3aaddfb1a238717644f529baa6c3e96a88
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:32:19 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37967' of git://github.com/jmvedrine/moodle

commit 26581a7420a018746d046ea0602ef99ddf3a3f5b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:10:35 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37987-master' of git://github.com/marinaglancy/moodle

commit 4e6bb9d315dbcb78aac026e4dc45b69f9ab9d1ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:07:17 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38075-m25' of git://github.com/samhemelryk/moodle

commit 80ba3a43902af16d72f849c4d153150fa198aa40
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 07:01:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37982_master' of git://github.com/dmonllao/moodle

commit 41e94a8d6f58d1014024138e848f6b4fe5eb11b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Feb 2013 06:26:09 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37872-m' of git://github.com/andrewnicols/moodle

commit 1ead0c63e9cdbdb80a64052c42cf93caf46573b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 20:13:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32620' of git://github.com/scriby/moodle

commit 57691c32b7658e4cef5e9c74dc45c3323686bfc4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 20:02:56 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36541' of https://github.com/Lightwork-Marking/moodle

commit 345768b9b80905e8e3aa116cf08497a67c1a1118
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 19:57:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35750' of git://github.com/danpoltawski/moodle

commit a5b1f1e2f272b901938606c2ebb826106573b3f6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 19:46:36 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38031-master' of git://github.com/FMCorz/moodle

commit 8337ed1e695b84c365690fec48d54ca8614c4082
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Feb 2013 19:23:41 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38033_dnd_uppercase_extn' of git://github.com/davosmith/moodle

commit 6033723098e16d359d1bfc0c745da8989bfdce5b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Feb 2013 05:49:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37598-abort-after-config' of git://github.com/mudrd8mz/moodle

commit fe4a6d3c38db15126740757de62ceb7b0c65895d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 17:12:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37953_master' of https://github.com/markn86/moodle

commit 7fe9a7863a8afe46cbbc85f6a51708241a6820e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 17:07:58 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37787_master' of git://github.com/dmonllao/moodle

commit b57f62c497416af41a38c8e17e46cd1080f9b390
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 17:02:23 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37893-grouped-empty' of git://github.com/mudrd8mz/moodle

commit e8e6802225a3fab892f181d871a973569eff707c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:20:56 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37943' of git://github.com/timhunt/moodle

commit ce9c32363577b8cb5f718b1921ed33fe02422547
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:16:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37686-master' of git://github.com/FMCorz/moodle

commit 625d5f8164e3c2a5d3f4071e09b93327c96e060d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:13:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37896' of git://github.com/timhunt/moodle

commit ef1a4d20d4ff6b7ac175a19b86c4db52a89943d0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 08:07:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37919-phpunit-exception' of git://github.com/mudrd8mz/moodle

commit 9a061c328596946783ae92b1b2ea95e1f05df9b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 07:59:39 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35037' of git://github.com/danpoltawski/moodle

commit 65412c365d351421db463738a0eb8b1c7bf7d623
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 07:43:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37961-master' of git://github.com/FMCorz/moodle

commit e196517bf52cbeb67ace8b7dfeb6d1994fff34ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Feb 2013 06:31:38 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35832-master' of git://github.com/phalacee/moodle

commit d220e90fbf38fc1ef78da0e2df6fb424b48e983a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Feb 2013 08:07:04 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37566-m-integration' of git://github.com/andrewnicols/moodle

commit 5ab0371d74f5abb48958b5b628ecf3c9a653bd69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 18:10:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37854_master' of https://github.com/markn86/moodle

commit 6617125ca400ff7b1f6bc580e202ddf9634159c1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 17:19:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37870-progressive_parser_exception' of git://github.com/mudrd8mz/moodle

commit b97d3e46df94b559c4b25c90f750cf718abb034a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 08:28:35 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36472-master' of git://github.com/FMCorz/moodle

commit b7c238798cc205b15cbea0dfe8e30b7ba75d4cb7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 08:14:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37566-m' of git://github.com/andrewnicols/moodle

commit 1df33d5427ac583454f2d6eb818cbd24cbcc20b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 08:06:40 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37780_m25_wintests' of git://github.com/skodak/moodle

commit 70e963ea9cfa4266a5dd17a2dc1b07b93a00de29
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 08:01:14 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37801_glossary_links' of git://github.com/davosmith/moodle

commit fc395e02f740ee7b71f7c9c03916204ff63e215b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:57:20 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37775_master' of git://github.com/lazydaisy/moodle

commit a0c3faeaefbb1671d338752187ab9354751dc779
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:35:24 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37785_master' of git://github.com/lazydaisy/moodle

commit f941a7864b4574c9800aca761b1e4f4563d393db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:28:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37523_master' of git://github.com/lazydaisy/moodle

commit 208f59137a92e4484407e5b82d72fcfcd2832da1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:13:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37518_master' of https://github.com/markn86/moodle

commit 1615caae6f571e339f564a949684a564e058f0ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 07:08:44 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle

commit 8d8f9cf756b5258769d88cd2b86d8a78c532ad89
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 06:58:41 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-33078' of git://github.com/danmarsden/moodle

commit a35a7644b993795e055adb9bb4abf714eb1b368a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Feb 2013 05:54:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37847' of git://github.com/timhunt/moodle

commit f97db0197841ca20e15028eb6de3d25dc7f2e46b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 17:27:11 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37644-m25' of git://github.com/samhemelryk/moodle

commit fb44a5db6f1ed7024cbae258fdfa985c6860a2b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 08:11:20 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37734_m25_marshack' of git://github.com/skodak/moodle

commit 6ca12c1cc192b36213f6c740ed4236ee84d63562
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 07:51:01 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37767_m25_pgsocket' of git://github.com/skodak/moodle

commit e2b2794368f49f3fba2cdcdce293fc8616338791
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 06:38:43 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-32420_master' of git://github.com/lazydaisy/moodle

commit 857b40256e747b8cfc897c0d9e7c476958c3cb3e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 06:33:22 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37526-m' of git://github.com/andrewnicols/moodle

commit a917ef63aec00af3d6f00e6acdd0bd5375982e2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Jan 2013 02:19:29 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37465' of git://github.com/colchambers/moodle

commit 96b997d759318c60099788b65f03681ffc765608
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 22:35:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37533-master' of git://github.com/damyon/moodle

commit 0ed03cc295448048b5bf293873658eed6d791015
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 22:19:11 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37101-master' of git://github.com/ankitagarwal/moodle

commit 6155915ffbba47b36be1a17d8d6cddb99182130e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 19:06:33 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36363-m25' of https://github.com/samhemelryk/moodle

commit 09d6bcc2325da9b66dfc0f93eeea098592e88351
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 08:33:08 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37718_m25_rs' of git://github.com/skodak/moodle

commit ee4cac2b44c32b6527165ec7c2f1fcb02c16aee3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 08:32:09 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37474-m25' of git://github.com/samhemelryk/moodle

commit fab951a6ae11f2a9c229dc28c07cf8503b857bc3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Jan 2013 02:23:17 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37545-m25' of git://github.com/samhemelryk/moodle

commit c9c75b39fd1b5c2e10ddd9e5d43be87fdd9d544e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Jan 2013 09:07:53 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37619-master' of git://github.com/damyon/moodle

commit 5afd8bfedee694a844377c84212eb4f953451d28
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Jan 2013 03:34:42 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-15930-master' of git://github.com/abgreeve/moodle

commit cccdddf2416a9556f05272c5e50a45cc704ab73f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 09:10:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37539-master' of github.com:damyon/moodle

commit 0aaf378cf958fca34534ee45138d204ccc5dd778
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:11:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36104_master' of https://github.com/markn86/moodle

commit 17f394f81a8990471a835ecae941c38194e797bf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:05:54 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37539-master' of github.com:damyon/moodle

commit 29a4621e47dc8523620a9d70d4a34d988990c5d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 08:02:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-28512' of git://github.com/timhunt/moodle

commit 6501e6e0374a1cf036b023294dc1a5506f6934e0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 07:52:42 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-37432' of git://github.com/rajeshtaneja/moodle

commit 37027f431b306acfb8feac8f6c70af7aaa4ad373
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 06:26:35 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle

commit fa669c49adc1f342d804a39a811fc95795296d3b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 03:08:12 +0800
Tag:    v2.5.0-beta

Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle

commit ea4edbd6bcf376ce2e9aa295c656b5695ee1e27e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 03:01:39 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37577' of git://github.com/timhunt/moodle

commit 6ee4df92abb50af51614743ca6772c4d9a2ea605
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Jan 2013 02:41:45 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle

commit 509c2758ceeac22144925a9036b2edde98bfe065
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Jan 2013 23:47:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34050' of git://github.com/rwijaya/moodle

commit 937ad8c62628321b3cb69782fcf88993ed49db82
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Jan 2013 03:52:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37555' of git://github.com/stronk7/moodle

commit 3431860f5476a536b23b311a909ceffad7f9566a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 09:27:48 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-36988_m25_switchrole' of git://github.com/skodak/moodle

commit 0c198a1b59f604b925adbec9f52396cff66acab3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 09:22:26 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37429_m25_zippacker' of git://github.com/skodak/moodle

commit 06d78e820981f5e3754d4996cc000de1411fb47a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 09:05:27 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36257-master' of git://git.luns.net.uk/moodle

commit becb4de7074ec60d606fe8cfa5c033a574074419
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 08:58:08 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37019_m25_metadef' of git://github.com/skodak/moodle

commit 91d5e08aa3b4027577b12b31448743caeac6f61c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 08:28:53 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35775-master' of git://github.com/micaherne/moodle

commit a91350609eeefd05ea29a9c64cfc371e909a668d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 08:08:26 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle

commit d9b9d22fa1ceb0daa4ea1a77e6a0e825133a44fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 04:56:13 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37173-m' of git://github.com/andrewnicols/moodle

commit 493d8f781c09230620374f6ea1d3e47baf68476d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 04:50:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle

commit 563bcc2322f1fab40cdba0a629a04342f172fb64
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 04:44:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31726' of git://github.com/colchambers/moodle

commit ee5c647e84d11b75831596894cc7193e51d6e6d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 03:14:03 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31616' of git://github.com/timhunt/moodle

commit dcb21e6cc132b7f6da2aa223df03ed27bee53557
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 03:04:21 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-37062' of git://github.com/rajeshtaneja/moodle

commit 0943a0ce1152973c2fef62b1c33d0d90d0c4fd47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:21:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34883_unit_tests' of git://github.com/andyjdavis/moodle

commit ceda80962ce8e262ba57dd1def76f953c005c1f0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:17:12 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle

commit 62a96046777e9e4d09a859d4c68830239a5879aa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:12:20 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle

commit ada893d339cf6362ec9deb11eabb70248f5d0b13
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:02:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36554' of git://github.com/rwijaya/moodle

commit dfcb38a1c704ed81788958123c7fff36cca3813d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Jan 2013 01:00:17 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle

commit ca2dfd0070aab59e757b50dad61fa2cc0a9a4399
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 07:16:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37431' of git://github.com/timhunt/moodle

commit eaa00a071ca6f2dd974c990072da1d4e8ff0ec59
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 07:06:06 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37453-master' of git://github.com/marinaglancy/moodle

commit fe25b31d44e8ad3f2faaa8614d96712a44036479
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 06:32:39 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37456' of git://github.com/danpoltawski/moodle

commit f38ac3510ad01d348552c79980f83d6dba3cdc09
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 06:29:55 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-37483_m25_redirect' of git://github.com/skodak/moodle

commit b9bbc2a3567668fe3f14ade51096f410850569b7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Jan 2013 06:21:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37485' of git://github.com/timhunt/moodle

commit d0942f074450a6663a177c0d29bb9b5e9a3055c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Jan 2013 19:15:57 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 72a504dc2ae3da6ff5a46f495d167ebe12d1091e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Jan 2013 18:13:13 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle

commit f9f750ceccb1ee73693ca4f4cee6ef50a93b3e14
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 08:32:09 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37420_m25_pgschema' of git://github.com/skodak/moodle

commit 8361f557a117211a21e657b8ad6b8bec402fbf69
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 08:31:50 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle

commit e801c74c54ea1e836d8b236a79fe484c80e1af9b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 06:30:19 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37183_m25_excelcleanup' of git://github.com/skodak/moodle

commit c68f339e5ee4f071ccc5f10eb0a2534795c555b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 06:25:34 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37203-m25' of git://github.com/samhemelryk/moodle

commit ac4c7aed68cbe70a53f3c865483548868ce6c82c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 06:11:54 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-35356_m25_excel' of git://github.com/skodak/moodle

commit 4f90540e0c5dde63a4f3eab9031f61b239d204ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2013 01:01:43 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37152_m25_smtp' of git://github.com/skodak/moodle

commit f9ba4fd83b98d32fae81d2c338f6063502e05285
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 18:54:19 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37220_dnd_icon' of git://github.com/davosmith/moodle

commit a74c3851f7a9e0ebc779f7246569faaf7ad06551
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 18:39:23 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37284_m25_mysqlutf8' of git://github.com/skodak/moodle

commit 783a51ba4822093b69a66ab9a728cd398cd1b4df
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 17:51:49 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37291_m25_paypalrestore' of git://github.com/skodak/moodle

commit cf78070a637cedf6a0166e73dbc7869c163565e5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 17:34:04 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle

commit b315a452742e1623682237b1ae7e94062fa9a3e9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 17:21:50 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37323_m25_dlgstrings' of git://github.com/skodak/moodle

commit 17e5c6e8d2abf6da3fbcd7a23f8ae4fe063d2460
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 05:40:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35794' of git://github.com/timhunt/moodle

commit 3cb7609bd61ea8e47447dd5f7fbe7a0f7ece0b68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2013 05:35:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35792' of git://github.com/timhunt/moodle

commit caf575e2bf657c73cdd20795d4ed2782787c6e5b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Jan 2013 18:44:16 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-36807_m25_mysocket' of git://github.com/skodak/moodle

commit 29400ba5d657d66525e146e764efa29dce268a1e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 21 Dec 2012 03:56:58 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 92bdda9bd977754c07c9a4fcd6153f952db83bc5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Dec 2012 17:22:46 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle

commit 917169221f17f02fb68708cdbe48ce5b5f8a01d2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Dec 2012 06:41:48 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-36245_m25_convert' of git://github.com/skodak/moodle

commit 421d18fd2e932cc6c1a1680a8cae3347cdb52e15
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Dec 2012 04:36:42 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36339-master' of git://github.com/marinaglancy/moodle

commit cbef51f54bfcb7c39ee79226991ef4d0ef826751
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Dec 2012 07:17:51 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36842' of git://github.com/timhunt/moodle

commit 7039c823dcebe77b1f63ef7431112c37ef62de66
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Dec 2012 07:13:45 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle

commit 04e56da75f96720513f0d363cc08f1438b2ec051
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 13 Dec 2012 17:31:59 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle

commit 12e13ce047edf13bd470ae6cd0ae5922564b7c2a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Dec 2012 05:48:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32880_master_3' of git://github.com/pauln/moodle

commit 4ad65dc2b68a9b3342fce5d688f265ca70f30226
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Dec 2012 05:42:09 +0800
Tag:    v2.5.0-beta

Merge branch 'm24_MDL-36641_Missing_external_package_HTTP_check' of https://github.com/scara/moodle

commit 771b82028500b2b2e5af1245acc684bee4dbe4c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Dec 2012 02:56:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle

commit ee22329a9045106e3f5314127c465e8b3bef314f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Dec 2012 09:24:47 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36341-m24' of git://github.com/samhemelryk/moodle