Git merges in Moodle 2.5.x by Aparup Banerjee

commit 45edc141260fcbecc1325938f2073c102a73a48b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Apr 2013 14:30:52 +0800
Tag:    v2.5.0-rc1

Merge branch 'w14_MDL-38798_m25_php55' of git://github.com/skodak/moodle

commit eeb47dbd30da03dab3c3bdd23109dba83cd71413
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Apr 2013 14:21:22 +0800
Tag:    v2.5.0-rc1

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

commit 163e0d3e706085455c092e3a243cc1c72f52979b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 09 Apr 2013 13:27:56 +0800
Tag:    v2.5.0-rc1

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

commit 37240ce5c6f4e1dc23708a6f6e7752a78f961cef
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 04 Apr 2013 15:07:01 +0800
Tag:    v2.5.0-beta

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

commit b8eb2f3dc6ed80e0e204019794502e8d0c878272
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 03 Apr 2013 16:48:53 +0800
Tag:    v2.5.0-beta

Merge branch 'm25_MDL-38745_SCORM_API_Debugging_trivial_issue' of git://github.com/scara/moodle

commit 7a2a430aa5f9e74cb89b6d117b5d87f7dc149e51
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 03 Apr 2013 16:32:42 +0800
Tag:    v2.5.0-beta

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

commit 8963212472b6194be9d46f4b70e0c1275752839b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 27 Mar 2013 13:07:10 +0800
Tag:    v2.5.0-beta

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

commit cf457c216997a8d0a9c7ab9480e84d5ecb54b13e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 27 Mar 2013 10:38:31 +0800
Tag:    v2.5.0-beta

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

commit be0eacf8839fdaaaea33374fc0cda2c10af058c7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 26 Mar 2013 17:20:01 +0800
Tag:    v2.5.0-beta

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

commit d54bc60b33ea504ce73a41d886c9afac1c4039c0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 26 Mar 2013 17:12:18 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38672_m25_purifier' of git://github.com/skodak/moodle

commit e1864424978333ede4a6ebed74299b596c9aa3d9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 13 Mar 2013 14:59:47 +0800
Tag:    v2.5.0-beta

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

commit 02dcf9b501d613c077fa51f5f0a35a477ef81c48
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 16:53:45 +0800
Tag:    v2.5.0-beta

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

commit ca5cb4ccac99470cc9152ee7194bcf10e6c30c07
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 15:55:17 +0800
Tag:    v2.5.0-beta

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

commit e14cc639f177ed59773ebdf0c0080a1cbcd180ec
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 13:37:25 +0800
Tag:    v2.5.0-beta

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

commit 34bbe80617d9b16582f2a53cde80a93bd966081a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 13:26:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35582_message_labels' of git://github.com/andyjdavis/moodle

commit 7b37b805d652c4bcee51681d9178b0723399bc61
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 12:22:28 +0800
Tag:    v2.5.0-beta

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

commit 58437b4cd36bd8425ae0b4f0ee3fced119355734
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 10:49:18 +0800
Tag:    v2.5.0-beta

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

commit f19de35c1f5c52ecfa9804a473e7ee02ced5e3da
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 11 Mar 2013 15:41:03 +0800
Tag:    v2.5.0-beta

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

commit c3d1c730769faa618664feb933436258f2681b5b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 07 Mar 2013 15:46:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38352-behat-fix' of git://github.com/dmonllao/moodle

commit c65e7fcbc8f8fcc6a1842cfa3d2e169c76a32f49
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 07 Mar 2013 10:41:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle

commit 045a4173b1c372d5cf351a5c311cbf3cc86839c7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 17:14:02 +0800
Tag:    v2.5.0-beta

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

commit 77e08c04d31a4f0a0be45fa7945fb22d0b0ce95c
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 17:07:50 +0800
Tag:    v2.5.0-beta

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

commit 11abbe276f0263e6bd41c99cf7e2cb5921e98233
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 17:01:54 +0800
Tag:    v2.5.0-beta

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

commit 810fb772c3b91dd8ba2a524ca8e0e5a148ae76d9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 16:00:49 +0800
Tag:    v2.5.0-beta

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

commit c0da001c4901c8386447b6506bbfdd1c82dd2686
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 14:43:46 +0800
Tag:    v2.5.0-beta

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

commit 212e5ee9090e4ba1f3a3db66a993f36e8a8790a8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 14:37:05 +0800
Tag:    v2.5.0-beta

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

commit c2b40106d3d01b565f71c98e66a7c23ffb69e3bd
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 13:09:37 +0800
Tag:    v2.5.0-beta

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

commit da33f689dc451b41998592ffd91e59a74f2681ff
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 12:55:41 +0800
Tag:    v2.5.0-beta

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

commit d1e220eb0e897c1c82a5fdf5a4cb99d609d8479d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 11:13:33 +0800
Tag:    v2.5.0-beta

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

commit fb3c1d2b3481937cd05db9951ca2ed77002d5bae
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 11:06:55 +0800
Tag:    v2.5.0-beta

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

commit 23a6fca502c41f929bef90d5dabc9e5131892da9
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 10:37:33 +0800
Tag:    v2.5.0-beta

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

commit b4f110f1a40f5e85cb87c2e613ecb91d67fa326d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Mar 2013 10:21:25 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle

commit 37c68301f94c225e6d479261a3a582e22f2bb60b
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 29 Jan 2013 16:33:37 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37499_m25_authldaptest' of git://github.com/skodak/moodle

commit 46112c0277c3c68c2e3cda752108d3b1f1183819
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 23 Jan 2013 14:57:45 +0800
Tag:    v2.5.0-beta

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

commit 072844a158ac02217e02706e4c2131520a1e49c0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 16:28:31 +0800
Tag:    v2.5.0-beta

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

commit 1a6192f9282c141ed7ad76be9cfaf8635e8474cf
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 13:57:25 +0800
Tag:    v2.5.0-beta

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

commit 447e59a1f289a8f8feb4281b75fe45d8d0ed7adb
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 12:10:48 +0800
Tag:    v2.5.0-beta

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

commit 8b042b1cc82fcc7e1ba0422cd98ce8a0a869181a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 11:37:24 +0800
Tag:    v2.5.0-beta

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

commit 60f95aad6ca27b6fde2c870ce597152b544518fa
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 11:08:16 +0800
Tag:    v2.5.0-beta

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

commit c0038fbe5be9122aecddcc67a86706b91adc501d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 10:59:26 +0800
Tag:    v2.5.0-beta

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

commit 5d4183b94fa63f39323b803ee6db4b1b7bd045a2
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 22 Jan 2013 10:56:06 +0800
Tag:    v2.5.0-beta

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

commit 5650cdb8fc7a92282c090171ffad50c4b508301d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 17:06:09 +0800
Tag:    v2.5.0-beta

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

commit 93c62e0cd89ce76b1b4b216aa4f1d9698b1a5178
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 15:26:13 +0800
Tag:    v2.5.0-beta

Merge branch 'w03_MDL-37559_m25_otherusers' of git://github.com/skodak/moodle

commit 4e0828c954ecff6bf0fa8ad25744c55db54418f7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 15:05:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37571' of git://github.com/tmuras/moodle

commit ebf5d99c6111762e53f30a38cf5408b31469246e
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 12:49:15 +0800
Tag:    v2.5.0-beta

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

commit 410fee1239c1e76da1fa9ed48f084545d13f4674
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 21 Jan 2013 12:38:13 +0800
Tag:    v2.5.0-beta

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