Git merges in Moodle 2.5.0 by Damyon Wiese

commit 5a378479a030af27439bb375d12e27513255f2bd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 May 2013 15:25:46 +0800
Tag:    v2.5.0

Merge branch 'MDL-39664' of git://github.com/nebgor/moodle

commit a9dcf2db60324854cd2b965a1a778c2c1df56569
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 May 2013 15:08:25 +0800
Tag:    v2.5.0

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

commit d458718f59de8ca648c6b96d44c25b9da8fb8da3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 May 2013 14:16:05 +0800
Tag:    v2.5.0

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

commit c938b909ba873bc19cb2f4f6462de6b3216f7716
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 May 2013 13:33:25 +0800
Tag:    v2.5.0

Merge branch 'MDL-39664' of git://github.com/nebgor/moodle

commit e1559b58e89780b5e9b79385792c3ea49443555d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 16:43:49 +0800
Tag:    v2.5.0

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

commit 826cf99fb8fa59f049c758459bd7111922999802
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 15:10:49 +0800
Tag:    v2.5.0

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

commit a02e36d68230edd9910ade031662b08aa08faac7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 14:59:37 +0800
Tag:    v2.5.0

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

commit 2c59e0ffaa830ebb0eb1b4038cb9a6e5a4758e13
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 14:05:30 +0800
Tag:    v2.5.0

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

commit 509c81cf07649f9786797599575a9931604d3316
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 13:43:07 +0800
Tag:    v2.5.0

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

commit 03d839c2706b9113e6597bd844a6e22d471ee5d0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 13:28:27 +0800
Tag:    v2.5.0

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

commit d9ffe3f9450cc51d2f7c06712118941122e0e6ef
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 13:22:32 +0800
Tag:    v2.5.0

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

commit 8b4c865543a1058c4bd6710e8c96384e0c18f8f8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 11:59:29 +0800
Tag:    v2.5.0

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

commit 1248133f7c77684663737c6a16ce38ebdc36db01
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 May 2013 10:30:51 +0800
Tag:    v2.5.0-rc1

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

commit dec909fcdd357344ebb9a22843e52474059fb884
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 May 2013 09:35:44 +0800
Tag:    v2.5.0-rc1

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

commit 944602889021f12ac7c1f3dc9f38d4d097ea20d1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 May 2013 13:48:41 +0800
Tag:    v2.5.0-rc1

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

commit 887e724796908ecbdbc5008f94766331ae71deec
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 May 2013 12:33:32 +0800
Tag:    v2.5.0-rc1

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

commit c8f7f2b5f3013940021160d16c71c48209ad0b11
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 May 2013 11:29:33 +0800
Tag:    v2.5.0-rc1

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

commit 8cfc9d75ed309bff02440cca2edbba8a262fb11b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 May 2013 10:22:16 +0800
Tag:    v2.5.0-rc1

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

commit 35aba517589803709888570486f5b295198d8d39
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 15:21:47 +0800
Tag:    v2.5.0-rc1

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

commit 9a2cc7b6c83b73c6df9d9a9c4a7be9403e343bd0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 14:57:49 +0800
Tag:    v2.5.0-rc1

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

commit 59add07d01d272deb87e97f3c027f2247272735c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 12:51:00 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-29472_m' of git://github.com/andreabix/moodle

commit 8ed91fdabb957e58e318bdc9fa3119f87527ff40
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 12:47:44 +0800
Tag:    v2.5.0-rc1

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

commit 5946813506be1cef6b646b3ec6ddb00c0517c88f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 23:06:09 +0800
Tag:    v2.5.0-rc1

Merge branch 'master_MDL-38102' of github.com:totara/moodle

commit 670fd5aad4e3f864a28176cc7e7b41cc912f38b3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 16:09:10 +0800
Tag:    v2.5.0-rc1

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

commit d285e5e628b23012886aa60ffcccb875aa37c2ae
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 15:28:17 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-31713_override' of git://github.com/andyjdavis/moodle

commit fc075899e061f27d13197650418635316d879f26
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 14:09:56 +0800
Tag:    v2.5.0-rc1

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

commit 98b2443961f04c1d84d235eeb22b80a342382923
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 12:43:50 +0800
Tag:    v2.5.0-rc1

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

commit a13512839062e9f7cedc7e975b3b67e5662ebdfd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 11:25:35 +0800
Tag:    v2.5.0-rc1

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

commit e0fc61f993f1a7926d25ed0ed1ffe2df78ae62c3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 10:41:44 +0800
Tag:    v2.5.0-rc1

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

commit 14cd6479de0614c6b6653c299ee3bd789a9ed39e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 22:27:41 +0800
Tag:    v2.5.0-rc1

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

commit da97cfe35ef7ef1d5e76338d227e6223f10b5725
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 21:57:19 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38480_m' of git://github.com/andreabix/moodle

commit 373a40c5db86211706d715d14acd77308e339f43
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 15:38:24 +0800
Tag:    v2.5.0-rc1

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

commit 3b8841dda2a100f6a85b7a713e45f87d29ad36a8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 15:31:05 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39143-master' of git://github.com/barbararamiro/moodle

commit 4017ea2fce7a600ab433756f45b811de997a5c68
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 15:15:02 +0800
Tag:    v2.5.0-rc1

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

commit 9fbf1dfb6e1ec8850840f6b916b0b3571c04b4f7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 12:27:19 +0800
Tag:    v2.5.0-rc1

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

commit 4c2a46e5078bf0a12fc9822e3f2c87333b7ec128
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 12:13:27 +0800
Tag:    v2.5.0-rc1

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

commit 80b9793b87f81d2e6a41a370794a2688eb0a30b8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 12:00:34 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39480_badge' of git://github.com/andyjdavis/moodle

commit 516b8c9029db8577c720f05f11b8170e48b27f8d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 11:43:37 +0800
Tag:    v2.5.0-rc1

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

commit e1cd72ec72ac318ec55498643c1b90b8acc59622
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 03 May 2013 15:37:57 +0800
Tag:    v2.5.0-rc1

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

commit e7c5ee5102767682efd3b83803f50b92334d89c1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 May 2013 16:20:30 +0800
Tag:    v2.5.0-rc1

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

commit b99122155c275719ca7cdb1dc46ba44994e7d373
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 May 2013 14:50:49 +0800
Tag:    v2.5.0-rc1

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

commit 9c898f682a70c06616901c42adf253b59944b94f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 May 2013 14:44:20 +0800
Tag:    v2.5.0-rc1

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

commit f85fba3eebbed9937a58990e55bb58abcbd6e00c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 May 2013 13:54:59 +0800
Tag:    v2.5.0-rc1

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

commit a6b274b232f85fc2a5f015360ea6775c9ec373bf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 01 May 2013 10:04:50 +0800
Tag:    v2.5.0-rc1

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

commit 89dc06570d9f55684bf81b62453190a987687892
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 16:24:07 +0800
Tag:    v2.5.0-rc1

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

commit 34e46d7556e8289440da0d4abfc1d87d8de560ee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 15:51:12 +0800
Tag:    v2.5.0-rc1

Merge branch 'mdl-39335' of git://github.com/vostreltsov/moodle

commit 59d003497c75ad8a75b34516e49cb3dc4a825f5f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 14:13:25 +0800
Tag:    v2.5.0-rc1

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

commit a10c057b8e94b40546168c4b71a82ac702ea10a2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 14:06:42 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39322-master' of https://github.com/mackensen/moodle

commit 767421c36c13552cadcaced08fcb657d76197682
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 12:26:47 +0800
Tag:    v2.5.0-rc1

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

commit 4969053f2522d6a27573ad8e6a7c6171057938d0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 12:02:36 +0800
Tag:    v2.5.0-rc1

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

commit de079cffbf2cb3c3c760f5b64e6be3c7ef2f8ca5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 11:39:24 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip_MDL_39230_2_5' of http://github.com/jamiepratt/moodle.git

commit 883e6a77cebb6738c7676a3877ba655e0b623534
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 16:05:08 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39356_m25_cacert' of git://github.com/skodak/moodle

commit 9b77b2011d7845e4febc0e78cd1e9cfcf102a479
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 15:35:40 +0800
Tag:    v2.5.0-rc1

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

commit b38218cfb05a27da6fbba17f506fb71e38887457
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 14:52:40 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39371_m25_cleandep' of git://github.com/skodak/moodle

commit b7098909c10c6affdfe0a4333aa1eb244001c61b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 14:17:53 +0800
Tag:    v2.5.0-rc1

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

commit ea03f1149e359b33e8f857d0d3c3b11b6fad1716
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 14:03:34 +0800
Tag:    v2.5.0-rc1

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

commit bc5775b0ea35318104de3e0af9f8da6ced5bac9b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 13:00:19 +0800
Tag:    v2.5.0-rc1

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

commit c59a99df30f8c9172045646fdcecf37d4fe597ef
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 12:22:23 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39174_m25_themedocs' of git://github.com/skodak/moodle

commit dd1ab4ae9acc25ecec9a96a214fcd1e5237dbc48
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 11:45:05 +0800
Tag:    v2.5.0-rc1

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

commit 50cc49ba042b142ef8b4758fa7075388e470f31c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 11:01:57 +0800
Tag:    v2.5.0-rc1

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

commit bd45c1aa4721d1253cb8bae8f537e3d8912911cb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 10:45:55 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-36024-master' of https://github.com/mackensen/moodle

commit 64bfea3b0e47fd0cbfe954fbdf25734374a97846
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 26 Apr 2013 11:55:30 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38833_settype' of git://github.com/andyjdavis/moodle

commit 44ed2fe740eb41332391719b571a478a45dcc088
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 26 Apr 2013 09:15:14 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39250_clean_master' of git://github.com/lazydaisy/moodle

commit 11b6045b091ccc169ae525436417ac37c32fcb96
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 24 Apr 2013 16:10:30 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-32946-master' of git://github.com/phalacee/moodle

commit 7d45396306a582a25b8bfcff7f5c6a3c8f801a83
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 24 Apr 2013 15:01:35 +0800
Tag:    v2.5.0-rc1

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

commit a6e22a88c7d0a75b0475a834d71d5d062234fd88
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 24 Apr 2013 12:53:16 +0800
Tag:    v2.5.0-rc1

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

commit c65bf472769b467baa6e8bd050c36d72407db361
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 24 Apr 2013 11:39:13 +0800
Tag:    v2.5.0-rc1

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

commit b0c4e47499fb9eb2b72d2da860185016be6a119e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Apr 2013 09:20:05 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-34933_master' of https://github.com/mchurchward/moodle

commit 3e8e66f454fecb0dd1ecb9bc920d940f6cefa0f4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Apr 2013 08:59:10 +0800
Tag:    v2.5.0-rc1

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

commit f5e9aa843c78f5259046edbfc01e564652d64d31
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 15:11:59 +0800
Tag:    v2.5.0-rc1

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

commit 00ec4acc8fea86786639462471aacc7e4ddff0b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 14:00:11 +0800
Tag:    v2.5.0-rc1

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

commit e9cd87eef2874b68078dfe2e07086dfc496d5cb5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 11:38:07 +0800
Tag:    v2.5.0-rc1

Merge branch 'w16_MDL-36959_m25_poolhashes' of git://github.com/skodak/moodle

commit b363d54ccdbf131b176b59259577c20ec889ec95
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 10:25:46 +0800
Tag:    v2.5.0-rc1

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

commit 80333fd96f6ba7df929871766fed0de92e5ea15c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 09:52:09 +0800
Tag:    v2.5.0-rc1

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

commit 35490f63573d1759220f3cece3a091327be1384f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 15:49:16 +0800
Tag:    v2.5.0-rc1

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

commit 43d31248168f89ba1942b4f92414dd6576df432d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 15:15:10 +0800
Tag:    v2.5.0-rc1

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

commit d9c22e944dddd68dbbfca3d022d118740b3cf761
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 13:58:15 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39084-master' of github.com:StudiUM/moodle

commit 747230d5649b2f17b9825f22cf7cd7ec34980e47
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 13:53:14 +0800
Tag:    v2.5.0-rc1

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

commit dd3b3a81d13f87f6c6589066abb5a5afcab02a5c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 13:13:28 +0800
Tag:    v2.5.0-rc1

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

commit d523d161feb9c201abb76e78e573d3f6eea28cde
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Apr 2013 16:56:09 +0800
Tag:    v2.5.0-rc1

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

commit 5073388e74434ebdedf3313f9f00cb83e477b661
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Apr 2013 16:03:33 +0800
Tag:    v2.5.0-rc1

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

commit 6a508eaccfece06dc232b48e1168b0c760faf325
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Apr 2013 15:56:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-34674_m25_spell' of git://github.com/skodak/moodle

commit e0cded5d44f3453fb5e2ebd73bd15140ac3e48e9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Apr 2013 14:32:53 +0800
Tag:    v2.5.0-rc1

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

commit 5f022c57993b303d0b1c5191d33228bd24e00b65
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 14:24:52 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39068' of git://github.com/stronk7/moodle

commit 23718dade9b9df193448f605f2fdbd0c5810120d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 13:30:28 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-37762-m25' of https://github.com/samhemelryk/moodle

commit 171c3d6c3cbae34b96b7184c5c9c25616f405897
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 11:57:38 +0800
Tag:    v2.5.0-rc1

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

commit ca17a1242a03cd1945cc72d51db42c172607a2d7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 11:01:27 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-35434_m25_storedfilesetting' of git://github.com/skodak/moodle.git

commit 6cf7afff3c0edf160ccf74e65c86850b58070fb8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 08:56:27 +0800
Tag:    v2.5.0-rc1

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

commit 77dd442ab94b4b261f8d9769cae79c56016cb8bd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Apr 2013 11:14:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-29877_bad_grade_item' of git://github.com/andyjdavis/moodle

commit f8ddbd24d74e7f212a1510112f2acb954e112236
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 10 Apr 2013 11:17:31 +0800
Tag:    v2.5.0-rc1

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

commit 92674e324e7f2b9e1fda2a735e4a776b619afea1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Apr 2013 15:13:21 +0800
Tag:    v2.5.0-rc1

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

commit e497e90c76803abeea17a7a7be749a704c05083d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Apr 2013 14:09:14 +0800
Tag:    v2.5.0-rc1

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

commit 9adb30759f93b3f95338929862fa58b881d770d3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Apr 2013 13:59:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-35608-master' of git://github.com/phalacee/moodle

commit 67879710ee70f1ec53b24a305c9223bddc5f281f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Apr 2013 13:20:52 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38865-master' of https://github.com/mackensen/moodle

commit 4fd1861c8fc3c2dbcaa4dcac36d67b3fa0f5be32
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Apr 2013 15:42:36 +0800
Tag:    v2.5.0-rc1

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

commit 278c280e8f0aede2494d46f48e04fd743f78d92b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Apr 2013 13:02:38 +0800
Tag:    v2.5.0-rc1

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

commit 5fbfc955d8400be784cc9a8f20d35e9bc5e35c9f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Apr 2013 12:32:56 +0800
Tag:    v2.5.0-rc1

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

commit a6c215ab1f90d72f7f8adeaafe76f44a8cc0b248
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Apr 2013 12:00:52 +0800
Tag:    v2.5.0-rc1

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

commit eafa0ba46a376a1fe114d4cd19abc3e9cde26718
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 05 Apr 2013 17:39:13 +0800
Tag:    v2.5.0-beta

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

commit 8806e79a14664b0032d9e4afa275d2c0394ea845
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 05 Apr 2013 17:10:14 +0800
Tag:    v2.5.0-beta

Merge branch 'openbadges-fixes' of https://github.com/danpoltawski/moodle

commit 6aa38ef89a3790b05ac019129522c656907bf4c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 05 Apr 2013 09:19:09 +0800
Tag:    v2.5.0-beta

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

commit 6ed18a6828de67fa317d647a51f11e4216a8a247
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 04 Apr 2013 14:26:15 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38633' of git://github.com/stronk7/moodle

commit 200571507ff3e841549b427ff5c0e74e43e0c674
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 04 Apr 2013 11:22:20 +0800
Tag:    v2.5.0-beta

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

commit b38f932abf280efce478581267bac84248460dbb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 04 Apr 2013 10:34:50 +0800
Tag:    v2.5.0-beta

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

commit 82b175e86891f336c875f37f825f873fc42cb6cf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 03 Apr 2013 15:48:35 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38627_m25_byteservingstop' of git://github.com/skodak/moodle

commit 9855770d6cebbf6e8bcaff32c47ce5b242d0318b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 03 Apr 2013 14:48:06 +0800
Tag:    v2.5.0-beta

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

commit 6fb437b2bbd222c67a9cc6ce5d282b40ad772642
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 03 Apr 2013 14:35:12 +0800
Tag:    v2.5.0-beta

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

commit 7bf602d9d30b53b9f0beb5142639794a4085b3ad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 03 Apr 2013 14:32:11 +0800
Tag:    v2.5.0-beta

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

commit cc067484a8629e942b068f2225e5b32b7d2ddf0c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 16:17:25 +0800
Tag:    v2.5.0-beta

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

commit 5423f9a0afd04597846ef731152bfe642723ff53
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 16:14:44 +0800
Tag:    v2.5.0-beta

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

commit bf6c1d0997a9d23d530a379b5f03401e01b6e7d9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 13:23:00 +0800
Tag:    v2.5.0-beta

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

commit 9ab0aece4983254738ca925ddaf2fccc0b7d755c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 12:48:08 +0800
Tag:    v2.5.0-beta

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

commit 86d66b5a1af2b201ddc33a1194e910d7e8c7aa44
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 28 Mar 2013 09:39:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-25631' of git://github.com/merrill-oakland/moodle

commit 604a8ed4e519a2b402f5f5233e11a668cd56ae33
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 27 Mar 2013 14:11:27 +0800
Tag:    v2.5.0-beta

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

commit ddeea94a35bd587fe0d855085bf342bb3ee14ffa
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 27 Mar 2013 12:17:47 +0800
Tag:    v2.5.0-beta

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

commit 1b393ce91de546b0082d416dfaf3159a6d6d060b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 27 Mar 2013 11:57:14 +0800
Tag:    v2.5.0-beta

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

commit df9bdfb0004e6e331faf9968840f023f10ae6802
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 27 Mar 2013 10:06:30 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle

commit 0231f91d864580efc75e3b33c7290a4c979d64f2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 16:11:47 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle

commit 3dbfd15872cd0063910e2ab073ec60e9473ce0c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 15:40:04 +0800
Tag:    v2.5.0-beta

Merge branch 'm25_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle

commit 2013daeb47b5e2632956d164adb2a4495bb712ef
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 15:13:35 +0800
Tag:    v2.5.0-beta

Merge branch 'm25_MDL-38468_Fix_MHTML_files_delivery' of https://github.com/scara/moodle

commit 96a927334311bbd0668d0fdc97d7358ea0b430fe
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:57:04 +0800
Tag:    v2.5.0-beta

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

commit 95764ab7efad24b67bc00bc53f4e7dd7109f908c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:49:34 +0800
Tag:    v2.5.0-beta

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

commit d0fd9726d1663ed8aefb413398adfec6507e8d76
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:29:57 +0800
Tag:    v2.5.0-beta

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

commit 0c241b980ad080cb2d154a3bec9e25627f549dc0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:22:11 +0800
Tag:    v2.5.0-beta

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

commit 8af0dffb5017fea25bf1401b290140711b306e51
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 13:46:29 +0800
Tag:    v2.5.0-beta

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

commit 37e50e931669ed9adf65a951bedf3e7ef6f14354
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 13:28:57 +0800
Tag:    v2.5.0-beta

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

commit 935ff91d5f1afe17f7cf4e4304ac924d06b1a074
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 13:23:53 +0800
Tag:    v2.5.0-beta

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

commit 553b23989a04065587a6b68a72554ba59f8f3312
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 13:12:29 +0800
Tag:    v2.5.0-beta

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

commit 1e425d185b68b6f77ff1e14d25c42197b1abdf47
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 12:59:53 +0800
Tag:    v2.5.0-beta

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

commit d21a452dcc21125601ee1d20acba6802e31e1e9b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 12:19:05 +0800
Tag:    v2.5.0-beta

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

commit 4e4ef99a15a64b12da9e72edc9f298c3323641c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 10:41:33 +0800
Tag:    v2.5.0-beta

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

commit 688f9a46b3638dfaf7c0c558b353cb50fb0c427e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 10:04:31 +0800
Tag:    v2.5.0-beta

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

commit febc08786edb3370f471cd46361bf4239a670326
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 09:38:46 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38650_master' of git://github.com/gjb2048/moodle

commit 0cdc5fc05989eb92a5999deb974608db806cadad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 16:00:00 +0800
Tag:    v2.5.0-beta

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

commit 3b5539af5e8c0e44e53956af0e99c0d08a428a6c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 15:51:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38668' of git://github.com/stronk7/moodle

commit 8b18c1bae5209031bef62f09913cca492f9195d8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 15:36:25 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38675_m25_tcpdf' of git://github.com/skodak/moodle

commit 35f155519e950d1c67a75c979fe51ca811d7f765
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 14:02:31 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle

commit 2e0b17051c98a4c8a2081ee4458d4e1a43a684c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 12:27:32 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle

commit e909c7c3907cdf2e4388031d5dc43a0923cf8689
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 11:30:36 +0800
Tag:    v2.5.0-beta

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

commit 716f35954eaee79c4f9c060d067bf5b4a2cd5b66
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 11:15:03 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-34917_master' of git://github.com/gjb2048/moodle

commit adfcc976f6399be6ce2754bf35fa4e18494bb4ad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 10:15:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31681' of https://github.com/Lightwork-Marking/moodle

commit 3bdb3e1605a0feebe16e9051100c5dd86c92e656
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 09:13:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37033' of git://github.com/stronk7/moodle

commit 39b041eca17a285298649cf6b083f13243f86b96
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 22 Mar 2013 13:35:24 +0800
Tag:    v2.5.0-beta

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

commit c2eb74df476db4c91d72230b109a6d865dea38df
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Mar 2013 14:08:55 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle

commit f50867c42487e403ab97b9c2cfd0aa3c46f5cfad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Mar 2013 13:24:18 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38387-m25' of https://github.com/samhemelryk/moodle

commit 80d852fa23a80ff9b068f654a26f227076785c1f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Mar 2013 11:05:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38373' of git://github.com/stronk7/moodle

commit 43087d02dd624c3e3f20e5541e06bbf64775890a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 16:17:41 +0800
Tag:    v2.5.0-beta

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

commit 0cabeada654251a82f8eb006ea87516d96c40369
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 15:47:35 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30790_25' of git://github.com/rlorenzo/moodle

commit db98fa786ea62c2f5b4a6a32d862f9565e573d74
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 15:18:13 +0800
Tag:    v2.5.0-beta

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

commit 851c304f45ad7e52ae27e17576c0e2b8f09057b4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 15:01:02 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38320_m25_logininfo' of git://github.com/skodak/moodle

commit 976b0ff2d4ff3bf5d44d3cd24ec6b0b53b1a3f73
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 14:54:40 +0800
Tag:    v2.5.0-beta

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

commit 08f5b90bb7c4ce655fb8a7948a0769dfd9db51b8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 14:36:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38426_dnd_plain_text' of git://github.com/davosmith/moodle

commit a34ffe2e2ecc8801df63f44bed547f16ec609117
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 14:02:23 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38456-mdeploy-paths' of git://github.com/mudrd8mz/moodle

commit 716db45f50e28f44f51895846cc70f8cca574fe9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 12:15:48 +0800
Tag:    v2.5.0-beta

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

commit dcc5f0fe1e32c44d1926a5e37608c0b8ba9c121e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 11:52:51 +0800
Tag:    v2.5.0-beta

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

commit 8fe55f6862d5033b9e1fb6b6c2215b993024035c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 11:13:23 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37079-master2' of git://github.com/mouneyrac/moodle

commit 23477802b7adbd4216aa14c3239e32b80034d415
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 09:31:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38367_dnd_ui_improvements' of git://github.com/davosmith/moodle

commit 7c211f565a272d64465a23b2087ae7940cde43e2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Mar 2013 13:45:41 +0800
Tag:    v2.5.0-beta

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

commit 9ccc1e1f34c94bc7a19853a49b8dd541e2c1c0ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Mar 2013 13:24:45 +0800
Tag:    v2.5.0-beta

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

commit 61e871c3c977d3afbbe45ed8936760a90c7c593b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Mar 2013 13:08:41 +0800
Tag:    v2.5.0-beta

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

commit 1ef6160aded8babccd796a187965dff4624ca313
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Mar 2013 11:41:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38215-workshop-oracle' of git://github.com/mudrd8mz/moodle

commit 71127292069e98bc6ba36026b2ac1b3250bbf21c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 13:49:57 +0800
Tag:    v2.5.0-beta

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

commit 6a284704fea9a2ae7e76772a519020c3468a7991
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 10:43:46 +0800
Tag:    v2.5.0-beta

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

commit 3f5ef33fb9080f1bb6ee779634e83a8b08504520
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 14 Mar 2013 15:30:32 +0800
Tag:    v2.5.0-beta

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

commit b37e555f6d3e9d068427cfd5b0020a1d4c0a6ef6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Mar 2013 16:12:00 +0800
Tag:    v2.5.0-beta

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

commit 61cd50618a5ff227f5a52006f94c5b2310a73abf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 16:35:19 +0800
Tag:    v2.5.0-beta

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

commit 3de89ef8eabd196d21281c887e0a0c773647cbda
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 16:11:38 +0800
Tag:    v2.5.0-beta

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

commit 43c791653b9d23e0404e1bb0c07a272c5b9c949f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 16:03:53 +0800
Tag:    v2.5.0-beta

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

commit f196cfe83af99b2bd02818238f4265db6ede0503
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 13:51:40 +0800
Tag:    v2.5.0-beta

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

commit 95045941e6cf1270bd101700664a3c758e89c44c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Mar 2013 16:19:53 +0800
Tag:    v2.5.0-beta

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

commit fcdb8cec4eadbe5d42b60d5d9c730817096b2ae6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Mar 2013 13:43:56 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-34713-master' of git://github.com/phalacee/moodle

commit e18c12c190cd4c8b89416ef841225a27478a75a6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Mar 2013 13:30:45 +0800
Tag:    v2.5.0-beta

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

commit ce91af8114aa534e251a6d98aaa9aa36b97c6295
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 16:06:31 +0800
Tag:    v2.5.0-beta

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

commit 915b7aca62b2867dbc93069a483fe9a7af9e6136
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 15:22:38 +0800
Tag:    v2.5.0-beta

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

commit d0eac6f6393f24e0a776b024ddb29757a7bed023
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 15:10:52 +0800
Tag:    v2.5.0-beta

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

commit ffb95d5fdc2f23e4a0446b634e8dcc3a0c60dcc7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 14:13:42 +0800
Tag:    v2.5.0-beta

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

commit 6fbf382cd4a470a374b07285fd333eca547b2c85
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 14:10:00 +0800
Tag:    v2.5.0-beta

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

commit be98769eabc8510f9b6f8f7a4493226a2ee1f3f7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 13:12:12 +0800
Tag:    v2.5.0-beta

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

commit 6be6b2b0738c111b447a13819ad0c199631d0833
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 13:05:57 +0800
Tag:    v2.5.0-beta

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

commit a27996bbad902e3adbbdefb3f1d271323b879f5b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 11:42:25 +0800
Tag:    v2.5.0-beta

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

commit b672408a1af9fd2361ef4b0e1c8e9a8bc993dff3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Feb 2013 10:45:21 +0800
Tag:    v2.5.0-beta

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

commit a3e57810c6537db1612b69afc1fdcbe5681bebd2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 15:49:13 +0800
Tag:    v2.5.0-beta

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

commit fffb9bbe6405cb951ecf5867988ebd134447810d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 15:42:13 +0800
Tag:    v2.5.0-beta

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

commit 61725199a9a805f3a36c781e26d5c5ff97051034
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 15:23:19 +0800
Tag:    v2.5.0-beta

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

commit 44c3f54c921545fb9ad5fa5ed7b6b03505a00bda
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 14:09:33 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle

commit c7cb130bce2f9b2b9ca14e4cf221169cf7f98e2f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 13:32:25 +0800
Tag:    v2.5.0-beta

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

commit cc7a1c891659ee81819ebfd31eac240a3928e12a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 12:37:56 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-30072-master' of git://github.com/phalacee/moodle

commit 23f7fed1e1d3f560bf4088c97cfd56545b162d5b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 12:10:06 +0800
Tag:    v2.5.0-beta

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

commit b625f85949cd7c2e792802fb656db848f97db8d7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 11:38:13 +0800
Tag:    v2.5.0-beta

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

commit dbfe8e26eeec8f3d2188491221766bda6927891c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 10:50:38 +0800
Tag:    v2.5.0-beta

Merge branch 'w08_MDL-38042_m25_flatroles' of git://github.com/skodak/moodle

commit 89fcdca1193636cff16419b2f07384323df4926a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 10:44:54 +0800
Tag:    v2.5.0-beta

Merge branch 'w08_MDL-38096_m25_manenrol' of git://github.com/skodak/moodle

commit cfd2addf3fc91ee438cb953225af7365cc576e82
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Feb 2013 08:54:57 +0800
Tag:    v2.5.0-beta

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

commit 1ec8da670689e135d5cef360f6d5ccaf8344392a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Feb 2013 13:48:12 +0800
Tag:    v2.5.0-beta

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

commit b27fc5b64f00d868430cf60c87339bfafdd967e0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Feb 2013 12:36:40 +0800
Tag:    v2.5.0-beta

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

commit ebb1385c39997ea301206ed8e703232d8f13cd70
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Feb 2013 10:10:48 +0800
Tag:    v2.5.0-beta

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

commit 74f3d44d37341b3125301903c47d86538ce03b4a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Feb 2013 14:51:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37687_comments_ajax_fix' of git://github.com/nebgor/moodle

commit 82a6332837b57fa67e6aad30cb6ca053330fe201
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Feb 2013 13:35:36 +0800
Tag:    v2.5.0-beta

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

commit cd747874a422257f9e113d620ad658c2964c4a24
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Feb 2013 09:30:47 +0800
Tag:    v2.5.0-beta

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

commit 082685e2de632afff57bf3b3013870060873e422
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 14 Feb 2013 13:37:48 +0800
Tag:    v2.5.0-beta

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

commit 6e591593871afa555d4fe36d532fcab4860ad535
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Feb 2013 15:04:51 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37750_master-add-seconds' of git://github.com/dmonllao/moodle

commit 147f5927425dce6ceb2b665e1bdc3bcb0b7b22a4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 14:48:40 +0800
Tag:    v2.5.0-beta

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

commit f49ec4297310f295af1999eb58d3f5dee1da168e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 14:47:50 +0800
Tag:    v2.5.0-beta

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

commit 2262c52122211cb402be52512817f495de78401c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 14:39:20 +0800
Tag:    v2.5.0-beta

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

commit 5926f85960e68e84399702f40ca873a9500a9ff5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 14:15:29 +0800
Tag:    v2.5.0-beta

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

commit 69046889674be668bb0ae963d43c8017022da511
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 13:09:18 +0800
Tag:    v2.5.0-beta

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

commit 7339d6c0e94704b53c913b0e1250d8188c73a2d9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 12:12:44 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37164_message_self' of git://github.com/andyjdavis/moodle

commit dad4fa26e71018e96dbc22d697ff255bba9e11c5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 11:40:40 +0800
Tag:    v2.5.0-beta

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

commit 234fdc206c10184650649c513b973a7b244dd270
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 10:09:26 +0800
Tag:    v2.5.0-beta

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

commit 82708d06158e397242a9393fc599849872bec02b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 09:15:23 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37831_filepicker_buttons' of git://github.com/davosmith/moodle

commit 1e7db9fee8061da051339f44e61acb087f5ab859
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Feb 2013 14:51:11 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-35332' of git://github.com/totara/moodle

commit 40f1c065b4ba90b330794e71a8373a9155a00d57
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Feb 2013 10:37:03 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30637-master' of git://github.com/lucisgit/moodle

commit eb28bb604f113d26fc5eb3e62ff6b20b60cff777
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Feb 2013 11:02:42 +0800
Tag:    v2.5.0-beta

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

commit 33d943500fe5cfdc132c0d3c5f5fd5a3b483e267
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Feb 2013 15:53:21 +0800
Tag:    v2.5.0-beta

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

commit 9d6f6a698797a8fdf042f0a6599d94d13a31099e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Feb 2013 14:11:07 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36206-master' of git://github.com/phalacee/moodle

commit 174d85723509e8e048b5a557b35f026897c761b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Feb 2013 11:49:16 +0800
Tag:    v2.5.0-beta

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

commit 183e656eeaeb2b7c2f17b5c234671650cf5b6559
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Feb 2013 11:23:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30102_master' of git://github.com/markn86/moodle

commit 935ec5e77e29394feed4d55a5d0fa0a0751f7618
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 16:18:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37781-workshop-schedule' of git://github.com/mudrd8mz/moodle

commit c15cda6138926dec48a8cb325792af8dcfa4f910
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 12:48:42 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37806-workshop-next' of git://github.com/mudrd8mz/moodle

commit c04dac34738d8fccbbae98e667b0a13a387d32d1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 11:35:54 +0800
Tag:    v2.5.0-beta

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

commit ef23b6ff4f66cd70962b342a80514ad573d97148
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 11:12:45 +0800
Tag:    v2.5.0-beta

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