Git merges in Moodle 2.5.0 by Sam Hemelryk

commit f000edba16c901a70a0dff1c4490dc278362932f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 May 2013 05:15:54 +0800
Tag:    v2.5.0

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

commit 55848bc3f6c7c1306fb798af451761c5348f82d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 May 2013 11:40:17 +0800
Tag:    v2.5.0

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

commit 8b5647b8d70660349ab9943e21b9c9ea4760ca70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 10 May 2013 12:41:15 +0800
Tag:    v2.5.0-rc1

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

commit 635d8bc84be14902b458fc33316a7c1108a4a477
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 10 May 2013 12:23:26 +0800
Tag:    v2.5.0-rc1

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

commit b3a9bf23f5ebb0e2ca943d2bdf3964ba15ef1e08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 May 2013 05:54:13 +0800
Tag:    v2.5.0-rc1

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

commit e4e8d577cd8c1b728066ec877881780948ce556a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 May 2013 13:11:28 +0800
Tag:    v2.5.0-rc1

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

commit d5cdfbc28884fdc3cfc2a620505f2e2078da1028
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 May 2013 12:13:06 +0800
Tag:    v2.5.0-rc1

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

commit d25103c4ef24a2f0a67fc815ea2419890a0467a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:15:24 +0800
Tag:    v2.5.0-rc1

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

commit eb426f2480c84a5036825f374427d35471d2c147
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:05:05 +0800
Tag:    v2.5.0-rc1

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

commit bcd4bf03431a22cc20d42e4d37ea4206a2793786
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:02:25 +0800
Tag:    v2.5.0-rc1

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

commit fdba83df89e7888736e3dbd736feae01e20e62f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 06:24:13 +0800
Tag:    v2.5.0-rc1

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

commit 48fce3678dc273fdcc3b6254598c926b232c59f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 06:14:28 +0800
Tag:    v2.5.0-rc1

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

commit d36cc73edb4b20841d9f5502b3c48d00b579b306
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 07:00:06 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39386_m25_enroldocs' of git://github.com/skodak/moodle

commit 2a03b6dafe37070c645dd88b5c9c5854e1c9a83b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 06:38:38 +0800
Tag:    v2.5.0-rc1

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

commit 0f540591df274ed8d5ea5a7b275b410407a2cf6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 06:08:20 +0800
Tag:    v2.5.0-rc1

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

commit 3e9406bc17f5e23528eee3b61cee27dcb5a58d40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:57:00 +0800
Tag:    v2.5.0-rc1

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

commit e76a515f3198890ac5d31b2d903bddb86e976ece
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:48:18 +0800
Tag:    v2.5.0-rc1

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

commit a91f5ccb86b9c30248faaf8e5df14768b249c8c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:36:50 +0800
Tag:    v2.5.0-rc1

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

commit 8e8a39aea03f55efe8778d2cd663f29845aef020
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:31:54 +0800
Tag:    v2.5.0-rc1

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

commit e6cf0a866b98e4e698c7397327167d4e001fa8fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 11:00:59 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39387_m25_authdocs' of git://github.com/skodak/moodle

commit 0c5d8ccb9aab65e8c025da1f1fd6e93ff4a4b9e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 07:15:05 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39336_m25_install' of git://github.com/skodak/moodle

commit 036b18a2979013008ec9df3c14aad87b0e16918c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 07:07:26 +0800
Tag:    v2.5.0-rc1

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

commit 57453609156b7c158014804c315bca0ebb11dca7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 06:54:07 +0800
Tag:    v2.5.0-rc1

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

commit 1517981b38d4743e400c8271e2ab06456ec7f672
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 06:45:33 +0800
Tag:    v2.5.0-rc1

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

commit 73766925275cb2e13d20c84da8bcade520b8e3eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Apr 2013 06:17:03 +0800
Tag:    v2.5.0-rc1

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

commit 6b39eee9fd737a5bcd5c699c67de1952cede806f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 11:34:17 +0800
Tag:    v2.5.0-rc1

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

commit 851ef997dfdad2ef6d21a8ee024b3c0f4812e471
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 11:25:46 +0800
Tag:    v2.5.0-rc1

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

commit 92809986aa7dadab84e21018f2241489ed9c4764
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 11:24:58 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39231_master' of git://github.com/bmbrands/moodle

commit 54ed002fdcdc5ade8917e60d92a5a4bdf5eadc5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 09:41:45 +0800
Tag:    v2.5.0-rc1

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

commit b88338f64764eb4a6d75bc09a98f20836fd9ad7a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 08:12:58 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38854_master' of git://github.com/bmbrands/moodle

commit 9c2cbcdc040ed1ad1a7765c9190e1ec36d59d62e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 07:37:34 +0800
Tag:    v2.5.0-rc1

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

commit 6801246c50fd953d67b64c85d0301c50d61411d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 07:10:51 +0800
Tag:    v2.5.0-rc1

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

commit c26f34baf11ad0e29dc61cdd86e4461a73557423
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 07:02:39 +0800
Tag:    v2.5.0-rc1

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

commit 9fdb1c1a638b881c5b31d7a95328f692330e4b42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 06:35:52 +0800
Tag:    v2.5.0-rc1

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

commit 48d253c10071c15a16e2542be799810460c3b0f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 05:23:54 +0800
Tag:    v2.5.0-rc1

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

commit 459699105c946e6c9d7ee121b23beebb6449c3e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 12:37:31 +0800
Tag:    v2.5.0-rc1

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

commit a03fdbb0997cad11510ee91057a8a5c6dc698971
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 12:23:21 +0800
Tag:    v2.5.0-rc1

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

commit 476554bbca4c95ae59f8cb598d4cc92d799f4b87
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 11:20:44 +0800
Tag:    v2.5.0-rc1

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

commit 91d72d31059e1bde5ebbb34ad1a436dc50246573
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 10:54:41 +0800
Tag:    v2.5.0-rc1

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

commit 52b4bd37e7e23fe78cf1e3a6bc279eafaa18fe0b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 10:41:25 +0800
Tag:    v2.5.0-rc1

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

commit 5ab262321c3817e9858aabc400f4ecb4a379c00f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 10:02:35 +0800
Tag:    v2.5.0-rc1

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

commit 4d35c88e10c9d3f478e2057e97a418d006ba08df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 09:53:55 +0800
Tag:    v2.5.0-rc1

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

commit ff76b6044b6a9e1c62bda791ca1f5080e84acc4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 09:48:32 +0800
Tag:    v2.5.0-rc1

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

commit 44cfa89576b0da9b52b873f7a5ef55f2a2cf42ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 11:57:50 +0800
Tag:    v2.5.0-beta

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

commit 2e2bac9d321b505a98b03e8d3718dd743093b744
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 10:30:45 +0800
Tag:    v2.5.0-beta

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

commit dc8e7116a75fbfa686c84ff95911b04370167390
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 10:15:24 +0800
Tag:    v2.5.0-beta

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

commit aa9f48ed5998af2ce043b352f87ae8794c4b0d30
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 10:12:08 +0800
Tag:    v2.5.0-beta

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

commit 5c1d5998acb3e5736a88a58a62b5e1977b08f731
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 08:54:10 +0800
Tag:    v2.5.0-beta

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

commit ed2703290cdcdd041a002406ab4218bbe14fdaf4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 04:30:02 +0800
Tag:    v2.5.0-beta

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

commit 486f9dbecc39f17a259668d573b6748cff235589
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:25:50 +0800
Tag:    v2.5.0-beta

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

commit 572282230242f36acfdde5129b738186ed0e582f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:13:09 +0800
Tag:    v2.5.0-beta

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

commit 1668803ae21887e1ea6d0e7a531fba1035d6edf6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:08:08 +0800
Tag:    v2.5.0-beta

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

commit 4ce761716c9e06ab2938df77a8b7cb1d59ac2026
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 09:35:59 +0800
Tag:    v2.5.0-beta

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

commit 74bf99ddad77b59a8e3bd88ddd7796d52814ca0a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 09:18:49 +0800
Tag:    v2.5.0-beta

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

commit 7171c61c40fc6ef979de5d48bc824d8adb8df5c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:59:58 +0800
Tag:    v2.5.0-beta

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

commit 121e6048519d09f048d153acb8615d7787c66401
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:35:16 +0800
Tag:    v2.5.0-beta

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

commit f0abd36e46cf7b4f2a45ae4718285211569fdd8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 05:37:51 +0800
Tag:    v2.5.0-beta

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

commit 07ccb35731d40c1721e23df5df9ca77ea8dec5fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Feb 2013 10:43:26 +0800
Tag:    v2.5.0-beta

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

commit da810f581687c2a8cd71f30740b1dec297315daa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 10:24:06 +0800
Tag:    v2.5.0-beta

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

commit ab58c6b724db692043f9538fa3a885ca4b0d0a88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 09:56:57 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37716_m25_enrolexpiry' of git://github.com/skodak/moodle

commit 3178ae6f09b7f30561ef45e9baa3d260c1e1abf9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 05:50:14 +0800
Tag:    v2.5.0-beta

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

commit dabe6985e4e76d54e19aa4ca9c973f5efaf060b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 05:19:31 +0800
Tag:    v2.5.0-beta

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

commit 41f3d113f72e42f33b8a6ed88b55f6cd4056cfcc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 05:17:01 +0800
Tag:    v2.5.0-beta

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

commit 49c204d1ee7e033df8a5c1623dce24ce7c9b9f9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:55:05 +0800
Tag:    v2.5.0-beta

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

commit 5126bab95c940ab526aedc75d3f5286195c97768
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:52:01 +0800
Tag:    v2.5.0-beta

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

commit bf6a1b90784a3242cd327011023438acd7c4b097
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:44:15 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37596_m25_schedmaint' of git://github.com/skodak/moodle

commit 8d8e6b151913d69ccd927d683f881fc0bfa960b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:39:35 +0800
Tag:    v2.5.0-beta

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

commit 44aad1234792cbb835f7a67bc70f07fb83fb92f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:33:41 +0800
Tag:    v2.5.0-beta

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

commit cb4adcc4a4b465913b6c9231b7394f2ff27340fa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:28:31 +0800
Tag:    v2.5.0-beta

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

commit 502e7853118814b68e5027cb8d90fc8cb1f6dc26
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 13:00:07 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37638_m25_rolecloning' of git://github.com/skodak/moodle

commit 44a951b28d85e84777295ab7a5c15bd0f05a54c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:56:05 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37666_m25_cssiesend' of git://github.com/skodak/moodle

commit d0ac573b7fdcce05f0c8f391096c6a5e8db5ac3e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:53:54 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37713_m25_testdir' of git://github.com/skodak/moodle

commit 3619009d0b2e94a54dcb0fa16b6ea1b1fa3d9842
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:50:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37677-obsolete-cache-debug' of git://github.com/mudrd8mz/moodle

commit 34e41c81f8ae18323692488f769987de88cdeffb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:49:24 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37673-muc-groupdata-typo' of git://github.com/mudrd8mz/moodle

commit 635bc28d98638128abf3e47259c61e101157c617
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:46:13 +0800
Tag:    v2.5.0-beta

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

commit be54d2015d564b4bb523f91e460f0d69a9bfe48e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:40:08 +0800
Tag:    v2.5.0-beta

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

commit d38df267a0e83bc2f49f5d35704d264ed8b0640d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:40:01 +0800
Tag:    v2.5.0-beta

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

commit 225a85806d7ad3a2c8956ced23b4725290d986bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:38:36 +0800
Tag:    v2.5.0-beta

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

commit 56a81ad8568ec159ae3f98d233f959f02ee98729
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:37:07 +0800
Tag:    v2.5.0-beta

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

commit 58f828ca14142611643b355977e97e3d78deaf08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:35:04 +0800
Tag:    v2.5.0-beta

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

commit f9a71cb033ba29371620563e0291c0a6e4054fb0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:29:24 +0800
Tag:    v2.5.0-beta

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

commit 682a1c0108afb4d28530341abaf02a1efc4f6105
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:25:51 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37728_m25_roledef' of git://github.com/skodak/moodle

commit 81ee22017aa5278a396d922ff18400ba7a85069a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:42:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37628-master' of git://github.com/grabs/moodle

commit e003d7dc5fec17d72b639b634293faee19ce93c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:36:28 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37640_m25_zipclose' of git://github.com/skodak/moodle

commit 0449f2e6da7dc2fd4d5803652112523f5954f2bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:32:09 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37407_m25_chineseunzip' of git://github.com/skodak/moodle

commit 7395c2b8e29701c9bb4917794833c760cea60994
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:29:17 +0800
Tag:    v2.5.0-beta

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

commit dff72cde30c1b35df8e1bb59d1d671111c2dda9d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 06:57:17 +0800
Tag:    v2.5.0-beta

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

commit 0f54ac5698aac75c2dd5701c77f027050106bedb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 06:32:53 +0800
Tag:    v2.5.0-beta

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

commit 8c35fcdcd9113e86e00e958e21df6a775e640f40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Jan 2013 06:08:55 +0800
Tag:    v2.5.0-beta

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

commit 8af97c2c2e69624d81d269c1c792669dc96cd686
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Jan 2013 05:03:42 +0800
Tag:    v2.5.0-beta

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

commit 9d98cb9f176c51c717d935b380dbe485ced72ae5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Jan 2013 04:54:36 +0800
Tag:    v2.5.0-beta

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

commit 36546841f19afa1ebbb40ca65da23967677e818b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jan 2013 11:35:03 +0800
Tag:    v2.5.0-beta

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

commit 0774b0d34c906874d3fe8ea2afb4c093ccffb68c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jan 2013 04:10:44 +0800
Tag:    v2.5.0-beta

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

commit 528d2633df88f45175c60998abc95a7e620e3173
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 05:18:33 +0800
Tag:    v2.5.0-beta

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

commit 11a5fab67058bd4c76b1e9cd622adcf773a6a6c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 04:47:00 +0800
Tag:    v2.5.0-beta

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

commit 20a31993978c59255473f6508d3327716633fa35
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 13:22:04 +0800
Tag:    v2.5.0-beta

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

commit e265716f6973e2746e53b9c211bddc0a55eeab77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 06:06:39 +0800
Tag:    v2.5.0-beta

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

commit ec16ef1f8563210840f8c4279c6be9b96346c8ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 06:03:39 +0800
Tag:    v2.5.0-beta

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

commit 00ba185d52922a6807677baabf851e3cea2bcca0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 06:01:16 +0800
Tag:    v2.5.0-beta

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

commit c8d3475e171cd8a6f62e2157906f9ca4e1f66ecd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 11:30:36 +0800
Tag:    v2.5.0-beta

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

commit 5a3d98c26dc761f4ae2f96d9fa53e8a70fc8687b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:48:53 +0800
Tag:    v2.5.0-beta

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

commit 2a6dbdcaee6c06a969df5e3a83abf64ec36a3f15
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:43:08 +0800
Tag:    v2.5.0-beta

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

commit 0fe5a201c035a081be0ce306947b34212c670f4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:37:54 +0800
Tag:    v2.5.0-beta

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

commit ddca5610d314fe41d98cff1290c873d17c01ff26
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:21:20 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31682' of git://github.com/Lightwork-Marking/moodle

commit ccc89b8235e8ddc9525e6139021c0f7d16feb546
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:12:44 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-36514_m25_enableself' of git://github.com/skodak/moodle

commit 110178c5c29333341ab839b9747c94121452a658
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 09:08:56 +0800
Tag:    v2.5.0-beta

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

commit f5c51a6d64b561217e915efff37cc2cd58e112bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 08:51:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35568_dndupload_hidden' of git://github.com/davosmith/moodle

commit 8b2d3f1bef7637f11057e70fc0b5e4e9ef625cf0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 08:40:06 +0800
Tag:    v2.5.0-beta

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

commit 469749706a2906f5dbdb31e93d3556d19002298e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:24:06 +0800
Tag:    v2.5.0-beta

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

commit 8d9c15a44eeffcb72acbd3544148e5f3f21620ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:13:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36511' of git://github.com/srynot4sale/moodle

commit 00df8f3f45775353f3200f003ffdd3594855fbd9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:47:37 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-32387_m25_paypalexpire' of git://github.com/skodak/moodle

commit c2e2da2e69a4e214d68f92fa618bb3f5ed4cf7d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:46:13 +0800
Tag:    v2.5.0-beta

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

commit d9a3d932dbb1ecc930f9b5f111b86b6877a09158
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:04:52 +0800
Tag:    v2.5.0-beta

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

commit 9abf0ed1dc6061859bc977987399d0eacf55ef38
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:00:00 +0800
Tag:    v2.5.0-beta

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

commit a0af8cb8c3dfcddade41e5d9613c18b2987f1f6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 09:35:09 +0800
Tag:    v2.5.0-beta

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

commit 6f51092fbee870beb5e32ba1e8d747215c152acb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 06:59:43 +0800
Tag:    v2.5.0-beta

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

commit 3913743aa3d0a054ffedadaf5422e0b8ade88e01
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 05:20:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle

commit 5ba45e34bbdfe0aa1209109be984870b3e6a354d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 05:07:16 +0800
Tag:    v2.5.0-beta

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

commit 21117c9d173e2e54fd513bf0d8b235b01e72e468
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 04:41:00 +0800
Tag:    v2.5.0-beta

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

commit f44e7d0a772514bef53ef480e4f5e5469deb2864
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 04:34:22 +0800
Tag:    v2.5.0-beta

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

commit b68fb448efc1e84c862372e3459dca200269737c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:07:03 +0800
Tag:    v2.5.0-beta

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

commit c4c1504b44bbe772cda5a751964d86621b03829b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:00:44 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-35893_m25_perfinstall' of git://github.com/skodak/moodle

commit 70601b94336039c5bab172c64efab18ae590ef6a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 05:56:39 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-21342_m25_lockout' of git://github.com/skodak/moodle

commit dd89f61e68e385b5dafa81c62ce4bc2603a2dd6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 10:22:37 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-29996_m25_oldfilters' of git://github.com/skodak/moodle

commit 8ca9539be5d75a139fe17712ce8eb65e45cff0f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 09:15:50 +0800
Tag:    v2.5.0-beta

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

commit 1bdc017f422bac75d771f5299386c85540cf1971
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:45:15 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-36212_m25_entities' of git://github.com/skodak/moodle

commit 816635ff033b2cde0aaae8cbf6cba301af8f7b77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:40:08 +0800
Tag:    v2.5.0-beta

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

commit 68ed412599d933c3d30ef478801b16b80ce135f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:35:25 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37281_m25_othersnav' of git://github.com/skodak/moodle

commit 5fc4ac8549c3c79cf43d98b625970c35fca37ced
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 07:05:26 +0800
Tag:    v2.5.0-beta

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

commit aedad9fcf3d53a3e9f6f0e6ee358cd203bc8aee6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 06:58:17 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37302_m25_roleedit' of git://github.com/skodak/moodle

commit 99f64911eefa4b9b39c3b0db3b4942d87d216a11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 06:40:11 +0800
Tag:    v2.5.0-beta

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

commit b8e551a89e08c0c9e7f4032c80e16df386d56b21
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 06:14:47 +0800
Tag:    v2.5.0-beta

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

commit f27cbf0790d9aa932f97e2cc06f1db79798ea6bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 06:06:41 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35887_dnd_completion' of git://github.com/davosmith/moodle

commit 02ad855adcafc532c938520fb5e7e367fbe1df0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:15:38 +0800
Tag:    v2.5.0-beta

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

commit 9fa3979c1599453743f97486cae070cbb9f08b81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:53:06 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37105_m25_catlimit' of git://github.com/skodak/moodle

commit b33f3d7c4039e2f1f781ac3e67cdbba957caf66b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:47:02 +0800
Tag:    v2.5.0-beta

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

commit 77f3d50d928eb7aac6bc0852c44aa1e5d16d00ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:38:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-29327_none' of git://github.com/andyjdavis/moodle

commit 083d5f8a48ed4d111a54041b934bc76b95788176
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:15:53 +0800
Tag:    v2.5.0-beta

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

commit 9ae14001aac7d6f25ac674b1e323deb09639e719
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:09:50 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37315_m25_ldappaging' of git://github.com/skodak/moodle

commit eaf750cd9a123b876a2afac38bd84c05f29cf644
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:43:59 +0800
Tag:    v2.5.0-beta

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

commit bef123d608193293d9cd8258227a6a132a028378
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:16:26 +0800
Tag:    v2.5.0-beta

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

commit 486c53f25c567fd10a7d83f4f730c997661b2086
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 05:55:31 +0800
Tag:    v2.5.0-beta

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

commit 296064bb9a1b4972efb1f75e6730dd53a1642dbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:40:55 +0800
Tag:    v2.5.0-beta

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

commit fe0980f846c5a7f1df27c2ba1d9da44c957d75ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:34:46 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-37225_static_cache_purge' of git://github.com/brki/moodle

commit d1a73b2add59d718b44b470f291e63c81e6c0bff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:30:35 +0800
Tag:    v2.5.0-beta

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

commit 9674194eec6377fcd715cb9bcba06001cdadd935
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:43:00 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-36475_m25_zindexesgrrr' of git://github.com/skodak/moodle

commit 2ea5e39ea3787d7802245f57ee7e7fb363f963ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:40:46 +0800
Tag:    v2.5.0-beta

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

commit 03765b2e9d6ebd7fba1c6d133d2d1c8d0b413727
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:32:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37035' of git://github.com/adrianfish/moodle

commit d135b55323896a8afdd755f245f4986a1d63031c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:24:53 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-37111_m25_forumsinglefirst' of git://github.com/skodak/moodle

commit a483113178db73e6f99c0fc0704bd313f6b514a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:12:37 +0800
Tag:    v2.5.0-beta

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

commit bdd7b01a33b109143cb1b4baa22450d8e5971d95
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:07:28 +0800
Tag:    v2.5.0-beta

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

commit 46b553787c918c22adbc6fe9b568d84053af4ba3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:51:42 +0800
Tag:    v2.5.0-beta

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

commit a202ead124855b1996d1f81f1c7bd2cbb8798ed8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:46:35 +0800
Tag:    v2.5.0-beta

Merge branch 'WIP-MDL-36812-master' of git://github.com/nadavkav/moodle

commit 740f635b790d6b9a99bd0a9281d2ecdabd2e6e0b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:42:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-29733_master' of git://github.com/andyjdavis/moodle

commit fa125570fba2cb693c03fee1e13943a1a708f7e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 06:10:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-27619_master' of git://github.com/pauln/moodle

commit 16ae43f243a32f9eee61c577d2b2ec8e97d09375
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:45:29 +0800
Tag:    v2.5.0-beta

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

commit db8625bd1e180d2542cf51cca8538c6be10c8bc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:38:43 +0800
Tag:    v2.5.0-beta

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

commit 5514e22d52cb6fbabffd7091800c97a7f5c9d513
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:35:27 +0800
Tag:    v2.5.0-beta

Merge branch 'wip_master_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle

commit 18e4963a742dd473ca32ad565ac81f57d4d3232d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:29:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36321_message_participants' of git://github.com/andyjdavis/moodle

commit 6e68a3a93c74b9c22e11caac68be2a7c0c1b77ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:11:13 +0800
Tag:    v2.5.0-beta

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

commit 0aed7e7d7137da978be35651bab5ad782ef59149
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:04:31 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-36731_m25_uploadestrict' of git://github.com/skodak/moodle

commit fc6acfe242b806c104bae30066c1a6e453ff8aeb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:44:37 +0800
Tag:    v2.5.0-beta

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

commit 9a8b79864ab51b062cda0113a0646f1e20cd95c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:42:13 +0800
Tag:    v2.5.0-beta

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

commit 159537f65ad07bb643161ee4258c34285ebe47aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:35:07 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-36936_m25_composerdev' of git://github.com/skodak/moodle

commit 7a6ef4ee8f871bab339b2bbac6e118e32cc92bbf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:27:26 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-37060_m25_sessinit' of git://github.com/skodak/moodle

commit 711e0ad9b781bd8718fb7f9e6b0a2a2f6b007967
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:04:22 +0800
Tag:    v2.5.0-beta

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

commit 6c3b271c3d5a7de446e158be8b5538e67721aa6c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:59:56 +0800
Tag:    v2.5.0-beta

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

commit 46c02a6a91b2e56d80b7adeac9f5eef6d5847136
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:54:16 +0800
Tag:    v2.5.0-beta

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

commit 9a2a9b146f393472c9a9f83bfdf3f457a8a017f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:44:08 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-37061_m25_invalidlang' of git://github.com/skodak/moodle

commit 0296e662a30c37e5189a0f33a8c900ad832ba1cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 05:22:19 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-29442_m25_entityutf8' of git://github.com/skodak/moodle

commit 4e0c4ec70d6c69512581435269dce2f210aa8d79
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 05:17:57 +0800
Tag:    v2.5.0-beta

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

commit a77a8f1e9dd1f1c4898faf55b1ab384abe5833f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:48:05 +0800
Tag:    v2.5.0-beta

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

commit 3dd842ebfb6f88add44ee486368a7f33bfb63c70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:42:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36601-master' of git://git.luns.net.uk/moodle

commit 5f27d134543067366befe7ce5618421a7402b6f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:16:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36805-master' of git://git.luns.net.uk/moodle

commit 8ebf086d31d1b7c60fba768c60dc1baa77164a82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 03:42:40 +0800
Tag:    v2.5.0-beta

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

commit 845774bf3363de545c7f8c6f18bcb5e5ad96efd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:59:42 +0800
Tag:    v2.5.0-beta

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

commit 754f808546371a10ceb8b88ec1a398f5ed451190
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:43:40 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36946-master' of git://github.com/micaherne/moodle

commit 11e95000bd98652488e0f729254468d30a6c97a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:28:44 +0800
Tag:    v2.5.0-beta

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

commit d60ac860ea9af8db0c28bc679687246f754af6d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:24:39 +0800
Tag:    v2.5.0-beta

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

commit 018e659061138b75f0f68a9b23cbbca5977511d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:21:37 +0800
Tag:    v2.5.0-beta

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

commit 9a3e76e01e6e8024ce9dee143781b7a1ebd53e63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:16:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36579_modLtiBackupFields' of git://github.com/moodlerooms/moodle

commit 9d8abffc870baccb463bf9b7726e6e17eaf2247a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:08:06 +0800
Tag:    v2.5.0-beta

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

commit 1b4e47e43a85b7fcc393e7c508daa4b037a66f9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 07:13:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36433-master' of git://github.com/itamart/moodle

commit 8b5944b9b97d23d29fa8544d0ea022e1fef5e282
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:54:01 +0800
Tag:    v2.5.0-beta

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

commit a429049ce564f9d289cec7852f5a02bb6551e88e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:51:38 +0800
Tag:    v2.5.0-beta

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

commit 7e4dd7f6c23614d6f49790212350d67b7bd02b67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:48:22 +0800
Tag:    v2.5.0-beta

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

commit 533469cba40fa3f9fa0bab79153be949198ab1aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:42:57 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36640-master' of git://git.luns.net.uk/moodle

commit fa9b53cdf81cec801d85155eda4164d166f230a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:00:17 +0800
Tag:    v2.5.0-beta

Merge branch 'message_nav' of git://github.com/andyjdavis/moodle

commit 70d09e7fd6d5f61e5e0064178ffccf659fa842d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:54:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36761_loop' of git://github.com/andyjdavis/moodle

commit f6c922e71f68764dd555323a7f81dc8785f8397c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:49:21 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34591_master' of git://github.com/grabs/moodle

commit d72f2212dae32394d0e6acd1d66a51a14f4a3ee2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:41:35 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35221-master' of git://github.com/kwiliarty/moodle

commit bb682c1ac2a53469fa2cd4181251c40787049fc4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:33:48 +0800
Tag:    v2.5.0-beta

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

commit 6d48072205348785f1e869a2f4878a6f74f2ba0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:27:25 +0800
Tag:    v2.5.0-beta

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

commit d229ac0f0a61e795d8c7aad97a3464c17aa269d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:23:55 +0800
Tag:    v2.5.0-beta

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

commit 13980de16bbce18cfb1bf5fd964c0bffe93f1af3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:19:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33125' of git://github.com/aolley/moodle