Git merges in Moodle x.x.x by Sam Hemelryk

commit f6c65c2575bb5ca986d093ed3f9d17b892c65c91
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Dec 2014 10:29:06 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-48430_master' of https://github.com/crazyserver/moodle

commit f3586f59c4f699930557b06c82fa2a95d71fa949
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Dec 2014 04:27:28 +0800
Tag:    v2.8.2

Merge branch 'm28_MDL-48389' of https://github.com/totara/moodle into MOODLE_28_STABLE

commit 8d666a615475664d8e84f51d0488e78e2d2a1612
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Dec 2014 04:27:23 +0800
Tag:    v2.7.4

Merge branch 'm27_MDL-48389' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit 6009ccb2f1b2259f10e11321ffc45d7b1adf6f7a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Dec 2014 04:27:18 +0800
Tag:    v2.9.0-beta

Merge branch 'm29_MDL-48389' of https://github.com/totara/moodle

commit 19f5623bf678592ef3cabf667fc4c9f1738ec3f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 11:57:11 +0800
Tag:    v2.8.2

Merge branch 'wip_MDL-36499_M28' of git://github.com/gjb2048/moodle into MOODLE_28_STABLE

commit 903cc3a6a04575bb002e9c4400bf554b52b495fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 11:57:07 +0800
Tag:    v2.7.4

Merge branch 'wip_MDL-36499_M27' of git://github.com/gjb2048/moodle into MOODLE_27_STABLE

commit 50c1f47ec4b3af2e81ca23c3bc41f53751d246e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 11:57:03 +0800
Tag:    v2.9.0-beta

Merge branch 'wip_MDL-36499_master' of git://github.com/gjb2048/moodle

commit ceee44706637fcf8af8a0839a185bcebbbc2a9bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 11:20:50 +0800
Tag:    v2.8.2

Merge branch 'wip-MDL-46486-m28' of git://github.com/marinaglancy/moodle into MOODLE_28_STABLE

commit 55307e61c6e3defe0461570fa296e743e4e55c89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 11:20:45 +0800
Tag:    v2.7.4

Merge branch 'wip-MDL-46486-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 1e12b5688caa15cfa80189e256747bd814666709
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 11:20:40 +0800
Tag:    v2.9.0-beta

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

commit 44a4b3d0725b5f635b5bc944e3a057d092f62094
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 11:13:40 +0800
Tag:    v2.9.0-beta

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

commit bf427373708cdfbeebe9d9fdf6ddfded872d23e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:58:56 +0800
Tag:    v2.8.2

Merge branch 'MDL-34437-28' of git://github.com/ankitagarwal/moodle into MOODLE_28_STABLE

commit 745992c3eefbbbca1aa4eba6400ee08b2d43f35a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:58:51 +0800
Tag:    v2.7.4

Merge branch 'MDL-34437-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit 54907a6a9b05ca777e958f50cf6957d346c71d02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:58:46 +0800
Tag:    v2.9.0-beta

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

commit 69668424590480ceba264ecd6644199c74eb685e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:38:51 +0800
Tag:    v2.8.2

Merge branch 'm28_MDL-46172' of https://github.com/greg-or/moodle-mod_assign into MOODLE_28_STABLE

commit 7bdce11859bbb41d29a92441d75908d2be5a9237
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:38:45 +0800
Tag:    v2.7.4

Merge branch 'm27_MDL-46172' of https://github.com/greg-or/moodle-mod_assign into MOODLE_27_STABLE

commit d5265ac28eb394749cdae53dbc84fc33c6a61eaa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:38:40 +0800
Tag:    v2.9.0-beta

Merge branch 'master_MDL-46172' of https://github.com/greg-or/moodle-mod_assign

commit 41ea5affc4bb95b976abd0232d087aae86c98f13
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:16:00 +0800
Tag:    v2.8.2

Merge branch 'mdl48517_28' of https://github.com/tlevi/moodle into MOODLE_28_STABLE

commit dd818b9b174989a471c5df8e0f6641da6c414cb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:15:56 +0800
Tag:    v2.7.4

Merge branch 'mdl48517_27' of https://github.com/tlevi/moodle into MOODLE_27_STABLE

commit 255501c90041ee12b9eca0a60821aa439e640305
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:15:51 +0800
Tag:    v2.9.0-beta

Merge branch 'mdl48517' of https://github.com/tlevi/moodle

commit 13ff5c990c23e5e51170f27abb2bb487ebb75be2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 10:13:33 +0800
Tag:    v2.9.0-beta

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

commit f071a177b08e5093cb9228892ff33a6033e0090e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 08:43:38 +0800
Tag:    v2.8.2

Merge branch 'wip-MDL-48366-m28' of git://github.com/marinaglancy/moodle into MOODLE_28_STABLE

commit 0f5ebed1b7169fe578dadaab7fccdd2cc5e2a96f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 08:43:34 +0800
Tag:    v2.7.4

Merge branch 'wip-MDL-48366-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 3e5f4b2ca9d663c078f1c702be989c124f1a3d8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 08:43:30 +0800
Tag:    v2.9.0-beta

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

commit e0b7f5492aadecb2e450b035f849f561ba6fb3df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 07:13:36 +0800
Tag:    v2.8.2

Merge branch 'wip-mdl-48426-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

commit 5e9b48a351a0e33088dca22743f37bb41ae075b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 07:13:32 +0800
Tag:    v2.7.4

Merge branch 'wip-mdl-48426-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit 440d861ccb9b6d369a77db1e06a769f55f22077f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 07:13:26 +0800
Tag:    v2.9.0-beta

Merge branch 'wip-mdl-48426' of https://github.com/rajeshtaneja/moodle

commit 7622b02f4c4edd249a45a6618d99ca264946648c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Dec 2014 05:56:53 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-43996-master' of git://github.com/jethac/moodle

commit 36814aaec6a0112da7e358b4046bd8d67e4920fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Dec 2014 09:51:01 +0800
Tag:    v2.8.2

Merge branch 'MDL-37704-28' of git://github.com/ankitagarwal/moodle into MOODLE_28_STABLE

commit dc0d55a1aa8bc692fe27d2fe82e3b98c6f73dfc2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Dec 2014 09:50:57 +0800
Tag:    v2.7.4

Merge branch 'MDL-37704-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit 922d32371a2e5677adb49c7b15e1245d010d84a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Dec 2014 09:50:53 +0800
Tag:    v2.9.0-beta

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

commit 22f098cd232801cb2631bc6e3d2152e32170ff3b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Dec 2014 09:24:14 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-26017_master' of https://github.com/ndunand/moodle

commit fef242fa6538c863666d0d43207fd8de28124962
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Dec 2014 08:58:24 +0800
Tag:    v2.8.2

Merge branch 'MDL-48058-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit 3bc123b2fda83a75b7c0fcd6106fc11f18fc4c62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Dec 2014 08:58:20 +0800
Tag:    v2.7.4

Merge branch 'MDL-48058-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 766ef7211baad31544407cb57954547cf95b381e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Dec 2014 08:58:15 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-48058-master' of git://github.com/andrewnicols/moodle

commit 8b0876cc10fc0c7c0616312ac0f3524240caaf13
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Dec 2014 06:15:32 +0800
Tag:    v2.9.0-beta

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

commit 101348192bf03cc3cb1ac99bb4a5220e219307c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Dec 2014 03:40:37 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github.com/Dave-B/moodle

commit fba1d33198c63dd7d837a8ea98ff41aac047c95b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Dec 2014 03:35:24 +0800
Tag:    v2.8.2

Merge branch 'M28_MDL46116_IMSCP_container_items' of https://github.com/Dave-B/moodle into MOODLE_28_STABLE

commit 21174ebcc12d327695c04993ca4194bdb24d4631
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Dec 2014 03:35:18 +0800
Tag:    v2.7.4

Merge branch 'M27_MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github.com/Dave-B/moodle into MOODLE_27_STABLE

commit f40124002bc775ff1d6774886faa371f76920b05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Dec 2014 05:03:09 +0800
Tag:    v2.8.2

Merge branch 'MDL-40419-28-2nd' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit 36f4c617b1c3c5cbd46964a8c17b1b389047c6d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Dec 2014 05:03:04 +0800
Tag:    v2.7.4

Merge branch 'MDL-40419-27-2nd' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 7594ed1e2a729270a85bdb1499bd87df6fbc499d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Dec 2014 05:02:59 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-40419-master-2nd' of git://github.com/FMCorz/moodle

commit 6c4e70a6d8e35c7f3a566b31f29adb07deb203ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Dec 2014 04:52:45 +0800
Tag:    v2.9.0-beta

Merge branch 'wip_MDL-47830_m29_pwrotation' of https://github.com/skodak/moodle

commit 91bae397b4a00e6e7e432887a749b072c604ad3c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 09:45:50 +0800
Tag:    v2.9.0-beta

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

commit c40f1f184f88b7c31c8ad857982e907c0059e6fa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 09:02:15 +0800
Tag:    v2.8.2

Merge branch 'wip-MDL-48377-m28' of git://github.com/marinaglancy/moodle into MOODLE_28_STABLE

commit 545d15da8ee4db7db4a8640a7f9b09a579b207fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 09:02:12 +0800
Tag:    v2.7.4

Merge branch 'wip-MDL-48377-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 0893f8d3992ff2d0bc683acd1a67f87d760e1a70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 09:02:08 +0800
Tag:    v2.9.0-beta

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

commit fc7ab00709b2f2fa807d3e5f29094900a5ff5515
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 08:58:20 +0800
Tag:    v2.8.2

Merge branch 'MDL-48382_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit 90254c5b6caa14b4d2e6439d26aaf779e6ea5de3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 08:58:17 +0800
Tag:    v2.7.4

Merge branch 'MDL-48382_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 0c3b2180d6d402b3e292f1537cc257f13b62cd23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 08:58:13 +0800
Tag:    v2.9.0-beta

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

commit 7c96d1e81d102356a213c0015d17421bc434b4a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 08:50:52 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-35696-master-course-meta-link-sort-order' of https://github.com/amandadoughty/moodle

commit b5e8781465f3fa8752a8c931d85e88d42c5f890f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 08:11:32 +0800
Tag:    v2.9.0-beta

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

commit a76c20c20e67373e5e9a35c0c3024d55aa0886a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:59:36 +0800
Tag:    v2.8.2

Merge branch 'MDL-46618_m28' of git://github.com/kordan/moodle into MOODLE_28_STABLE

commit 56204564e5c4423ecc7e891ca9f69284ecc69b1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:59:32 +0800
Tag:    v2.7.4

Merge branch 'MDL-46618_m27' of git://github.com/kordan/moodle into MOODLE_27_STABLE

commit ecf3b93d3984900743cab2e300a628d18b9561ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:40:57 +0800
Tag:    v2.9.0-beta

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

commit 824c31e5925df2027a77dfdec8f50671e3d83e76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:35:53 +0800
Tag:    v2.8.2

Merge branch 'MDL-14402-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit 2f0a90c22f6a5c016ef5ed08c7c7296178f282e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:35:49 +0800
Tag:    v2.7.4

Merge branch 'MDL-14402-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 602b281dcb0a515308ffd3266c8d3e54a54a8ddb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:35:44 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-14402-master' of git://github.com/andrewnicols/moodle

commit cba386b63688df53ecbbd303d111f6f4b059d718
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:31:36 +0800
Tag:    v2.8.2

Merge branch 'MDL-48384-28' of git://github.com/danpoltawski/moodle into MOODLE_28_STABLE

commit eeab296542737a96f11ee03e10bdd92dfcbfc47b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:31:33 +0800
Tag:    v2.7.4

Merge branch 'MDL-48384-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE

commit 930d160bcd362fb63c6c64cde698b7570164036e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:31:29 +0800
Tag:    v2.9.0-beta

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

commit 438b185951a654c57f6fcdf4abbc05c1e5dc1115
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:10:29 +0800
Tag:    v2.8.2

Merge branch 'MDL-48309-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit 783d96c6dabd5b0584a4585792f4c4fe07639ca3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 06:10:25 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-48309-master' of git://github.com/andrewnicols/moodle

commit e2f7da2a802c304569fe3192fe7c34eab5dc9718
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 05:45:04 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-34867-master' of https://github.com/tbannister/moodle

commit 231cb5e3d41fe92562ebb65602109f68a6f1fa45
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 05:34:18 +0800
Tag:    v2.9.0-beta

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

commit 0fec60deea2e742a5a77a77c8082a99732db8a43
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 05:19:31 +0800
Tag:    v2.8.2

Merge branch 'MDL-47133-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit 6fae37e111a3ec81c8ef1485f8ef492e7b8aead8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 05:19:27 +0800
Tag:    v2.7.4

Merge branch 'MDL-47133-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit f7e646a5c1ce787fda7c3dcfa014498be5d26f9e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 04:14:50 +0800
Tag:    v2.8.2

Merge branch 'MDL-48227-28' of git://github.com/ankitagarwal/moodle into MOODLE_28_STABLE

commit 2d1df7a3be2c564f48952ae99c12e9f168ca8ea1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 04:14:46 +0800
Tag:    v2.9.0-beta

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

commit eb8f9f9adb2655143ce757553303312a02641df3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 03:47:34 +0800
Tag:    v2.9.0-beta

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

commit af9e696b79de6d1c50c678ba6883865331932b40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 03:33:57 +0800
Tag:    v2.8.2

Merge branch 'wip-mdl-48192-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

commit 1eded976e513efc0776e3c43011cf96d0cea5b34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Dec 2014 03:33:53 +0800
Tag:    v2.9.0-beta

Merge branch 'wip-mdl-48192' of https://github.com/rajeshtaneja/moodle

commit 58aabfcedd954d54c5c84bc3889d2c23e83d3489
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Nov 2014 04:06:11 +0800
Tag:    v2.8.2

Merge branch 'MDL-22309_28' of git://github.com/dmonllao/moodle into MOODLE_28_STABLE

commit ac8c1538629008b782e8e56a6a68290c99f264d6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Nov 2014 04:06:08 +0800
Tag:    v2.9.0-beta

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

commit eccf806ad05c573a90087a2cf8a7db6d6423c599
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Nov 2014 03:59:13 +0800
Tag:    v2.8.2

Merge branch 'MDL-48191-28' of git://github.com/jethac/moodle into MOODLE_28_STABLE

commit 55dc0eb979ea4f7796c65b55d5e690bc89addb53
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Nov 2014 03:56:27 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-47329-master' of git://github.com/jethac/moodle

commit 1198f5ae01f19b6f0dd13b5a35af1eeb9d0db8fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Nov 2014 03:43:36 +0800
Tag:    v2.8.2

Merge branch 'MDL-47329-28' of git://github.com/jethac/moodle into MOODLE_28_STABLE

commit d5f17c854b427ab1acad2d474cdbaab66b306e11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Nov 2014 03:43:34 +0800
Tag:    v2.7.4

Merge branch 'MDL-47329-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

commit b42123f38cb14417ac5d439585f26a611c515cd1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 10:54:20 +0800
Tag:    v2.8.2

Merge branch 'MDL-22043-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit b15c43b1973e885a29743cafa2a0778e6384b6a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 10:54:16 +0800
Tag:    v2.7.4

Merge branch 'MDL-22043-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 22fc0d15dd0e9bd2df92c677741b8c1f589f6d84
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 10:54:12 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-22043-master' of git://github.com/andrewnicols/moodle

commit 76a3bfec12603301ea03beef39b6d24a54460516
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 10:47:57 +0800
Tag:    v2.7.4

Merge branch 'MDL-46534-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit b3351c0133567de452f15c5285d3ea606b2fee91
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 09:07:24 +0800
Tag:    v2.8.2

Merge branch 'MDL-23839-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit 70554009a399d0c289d5022e7f0f687437089cc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 09:07:16 +0800
Tag:    v2.7.4

Merge branch 'MDL-23839-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 328e4e4c7736f9302f44e112edc312aeb4fe1707
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 09:07:08 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle

commit e8ffea7bd5b88cffc9ac30a65b101a7179457512
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 07:29:04 +0800
Tag:    v2.8.2

Merge branch 'MDL-23912-28' of git://github.com/jethac/moodle into MOODLE_28_STABLE

commit 06b1368f883e1b9c8f66ca18cf9d9cd88df27ecb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 07:29:01 +0800
Tag:    v2.7.4

Merge branch 'MDL-23912-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

commit 4cbf997db052a134d715d888ac22548ad2ebff46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 06:02:19 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle

commit 222f015381491af1887fb71c9f22d7eb2c824bb2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 05:52:59 +0800
Tag:    v2.8.2

Merge branch 'MDL-48246-M28' of git://github.com/lazydaisy/moodle into MOODLE_28_STABLE

commit 0db7d1b6a25aaffe722970510aa36b6001338797
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 05:52:52 +0800
Tag:    v2.7.4

Merge branch 'MDL-48246-M27' of git://github.com/lazydaisy/moodle into MOODLE_27_STABLE

commit 406712e9895f703da106ef90b4608ad39abcae95
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 05:52:42 +0800
Tag:    v2.9.0-beta

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

commit 9e65f9160a1726e4c4b3c0ef3879e170c18f1631
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 05:49:54 +0800
Tag:    v2.9.0-beta

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

commit 5a9e656628fb633fe09dc6b4759adea8dbcdc196
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 04:42:56 +0800
Tag:    v2.8.2

Merge branch 'm28_MDL-48265' of https://github.com/totara/moodle into MOODLE_28_STABLE

commit 7d6ac9b85f04ca1fb129e62109c5f159dc33e64f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 04:42:51 +0800
Tag:    v2.7.4

Merge branch 'm27_MDL-48265' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit 9e921abaff812c15cb579d7995acbe5bac1f6824
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 04:42:46 +0800
Tag:    v2.9.0-beta

Merge branch 'm29_MDL-48265' of https://github.com/totara/moodle

commit 35ccccf368ffa4688bba4d4d2b904c6fd388e316
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 04:39:33 +0800
Tag:    v2.9.0-beta

Merge branch 'wip_MDL-48282_m29_firstaccess' of https://github.com/skodak/moodle

commit 9e9af6736a64c8c6e399e5bb29d87cbcd954c52e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Nov 2014 03:19:04 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-20365_auth_db_salted_passwords' of https://github.com/MorrisR2/moodle

commit b4d7288e94eba16494f74ab75e517c4274ff2b11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Nov 2014 10:58:03 +0800
Tag:    v2.8.2

Merge branch 'MDL-48148-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit d148da7e56f43e1f5496b0d587b913127a64d4a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Nov 2014 10:57:59 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-48148-master' of git://github.com/andrewnicols/moodle

commit b52e55bb47a21fbb68fe400ce03273d895dcc45d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Nov 2014 10:53:56 +0800
Tag:    v2.9.0-beta

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

commit 43e413f93f3dc9f5be92483751e2ef1ef9fc4d40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Nov 2014 09:54:25 +0800
Tag:    v2.8.2

Merge branch 'MDL-48064-m28-master' of https://github.com/dthies/moodle into MOODLE_28_STABLE

commit 14eec5af8f0f5be76662ce4f9936a39451795d11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Nov 2014 09:54:21 +0800
Tag:    v2.7.4

Merge branch 'MDL-48064-m27-master' of https://github.com/dthies/moodle into MOODLE_27_STABLE

commit 6d84f28553f118c2064a748194650f37e01f7128
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Nov 2014 09:54:16 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-48064-master' of https://github.com/dthies/moodle

commit f9ed19e476fc63e4280951bbf11f51370ac77bcc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Nov 2014 05:06:04 +0800
Tag:    v2.7.4

Merge branch 'MDL-35494_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 74cb9073d0eb7eb346f8e783fd104eda4be2a45c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Nov 2014 05:06:00 +0800
Tag:    v2.9.0-beta

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

commit c19e95c87127bb41b46619c1abed60c65d8e9440
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Nov 2014 05:02:47 +0800
Tag:    v2.8.2

Merge branch 'MDL-48288-28' of git://github.com/jethac/moodle into MOODLE_28_STABLE

commit 7a5e6054248ef18f05a228ab0db4d05e5d782180
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 20 Nov 2014 04:12:14 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle

commit c81ae06997d12787d5e4bce1ca9e3bfd5193ae43
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Nov 2014 04:37:24 +0800
Tag:    v2.8.2

Merge branch 'MDL-33606_28' of git://github.com/dmonllao/moodle into MOODLE_28_STABLE

commit 0391103027552155750b9473faf59a71246c5996
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Nov 2014 04:37:21 +0800
Tag:    v2.7.4

Merge branch 'MDL-33606_27' of git://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit 469c32955ac25f72b7eafab2e08a9e6539bab420
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Nov 2014 04:37:19 +0800
Tag:    v2.9.0-beta

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

commit 756350b82d0267217d34a9acf087326bc7919afb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Nov 2014 04:18:36 +0800
Tag:    v2.9.0-beta

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

commit 299f1bcdbd7ad8c7f16fbafb1aa19f305fdb705e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 12:38:08 +0800
Tag:    v2.8.2

Merge branch 'wip-mdl-48250-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

commit f51988665f73ff2b0c42bc13444022eea53c4683
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 12:38:03 +0800
Tag:    v2.7.4

Merge branch 'wip-mdl-48250-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit 1b4af6f37114a32c346ba36d00dc9b7c02ca0ae6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 12:37:57 +0800
Tag:    v2.9.0-beta

Merge branch 'wip-mdl-48250' of https://github.com/rajeshtaneja/moodle

commit 2f365ee4aa714656308b44db63a020cf9aaf0eb5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 11:48:27 +0800
Tag:    v2.9.0-beta

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

commit 09de24667f914b9c86445230ed6704b1f0b1a839
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 11:47:30 +0800
Tag:    v2.8.2

Merge branch 'MDL-29585-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit ecda42ce1f00104d8cd36d460fdcf7cd48d4487a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 11:47:27 +0800
Tag:    v2.7.4

Merge branch 'MDL-29585-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 7b604fd9f1cb67275f18a862789562d70c8fa6a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 11:47:24 +0800
Tag:    v2.9.0-beta

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

commit 5b9a75e1fe7e7dc74666e079d3301406a688cd55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 08:34:29 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-47527_master' of https://github.com/StudiUM/moodle

commit 292e991b86d3f49459f9931f80e9a1f3a3121fc7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 06:12:32 +0800
Tag:    v2.8.2

Merge branch 'MDL-47618_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit 2337865922ebafce9b3937d15b03d9ebc331c90d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 06:12:30 +0800
Tag:    v2.7.4

Merge branch 'MDL-47618_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 817e9010c1d523953ca9d224f2315783b5e31dd7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 06:12:28 +0800
Tag:    v2.9.0-beta

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

commit 6067a4c87c4a579b354fcfabc988e6d59071066e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 05:57:29 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle

commit 06404b01180a2965804fab9e47715fdc2b6bdfb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Nov 2014 05:48:31 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle

commit e9f7276481780e8c9a6b50a7bf359950c04dc23b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 09:37:58 +0800
Tag:    v2.8.2

Merge branch 'MDL-48115_28' of https://github.com/totara/openbadges into MOODLE_28_STABLE

commit d02d0a4f31aa4c0819e9e2280983d6e5b301f958
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 09:37:53 +0800
Tag:    v2.7.4

Merge branch 'MDL-48115_27' of https://github.com/totara/openbadges into MOODLE_27_STABLE

commit 1f4039d84fefb1d6e942effd286b15b6cb39ea8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 09:37:49 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-48115_master' of https://github.com/totara/openbadges

commit b1dd1c86569bdbe8a0640c8d2445a71cf5e11a17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 08:39:17 +0800
Tag:    v2.8.2

Merge branch 'MDL-48194-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit 88aefc4910194bb0269f36b9a8dc2d074bd3c311
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 08:39:13 +0800
Tag:    v2.7.4

Merge branch 'MDL-48194-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit d6abe6f744593c60dd7f2be5c7aa8a6b74f60ea6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 08:39:03 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-48194-master' of git://github.com/andrewnicols/moodle

commit 6b5f44b214861443e6f526c501b817b38282e6d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 08:21:05 +0800
Tag:    v2.8.2

Merge branch 'MDL-48171-28' of git://github.com/ankitagarwal/moodle into MOODLE_28_STABLE

commit 993e61d97004a71507c3bcf5b478b6f8bc53a628
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 08:21:02 +0800
Tag:    v2.9.0-beta

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

commit e3adeba88683f59ad1e496873b4972e7659b913e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 07:48:12 +0800
Tag:    v2.8.2

Merge branch 'MDL-48179-m28' of https://github.com/sammarshallou/moodle into MOODLE_28_STABLE

commit 399e3f33a1d32ef1dffc674c867cac3f9b1aeb32
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 07:48:08 +0800
Tag:    v2.7.4

Merge branch 'MDL-48179-m27' of https://github.com/sammarshallou/moodle into MOODLE_27_STABLE

commit 0d23255b89d4791300802faa4cf48a576b14a1a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 07:48:04 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-48179-master' of https://github.com/sammarshallou/moodle

commit 666ac939d5dc909d2cd4680f9221997fbb634e86
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 07:34:16 +0800
Tag:    v2.8.2

Merge branch 'MDL-48196-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

commit d38d8313df7321cfafcfb0deacf16194aec29c2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 07:34:12 +0800
Tag:    v2.7.4

Merge branch 'MDL-48196-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit b83a0323daa14d662ed77d27022a347a049f7d99
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 07:34:02 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-48196-master' of git://github.com/andrewnicols/moodle

commit 2928dfd8a0a1d46e7241ef322eeea3c2c4a478ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 07:19:14 +0800
Tag:    v2.9.0-beta

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

commit d2fe097e200e539e4f9edcb804a8b541d75f9d24
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 06:50:54 +0800
Tag:    v2.8.2

Merge branch 'm28_MDL-47993' of https://github.com/totara/moodle into MOODLE_28_STABLE

commit 6769628da604bce4cfe55541ae68ca0ba6a345eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 06:50:50 +0800
Tag:    v2.7.4

Merge branch 'm27_MDL-47993' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit b1298c76906301a56e4ff470ac1e02f2434a2e01
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 06:45:01 +0800
Tag:    v2.8.2

Merge branch 'MDL-43628_v28' of https://github.com/scyrma/moodle into MOODLE_28_STABLE

commit 57fa596e0fe66c8911e8db5e844807e4e10a192d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 06:44:57 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-43628' of https://github.com/scyrma/moodle

commit fbcf4385a4aa081ccb3dcd4b20d6416708c050ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 04:50:35 +0800
Tag:    v2.7.4

Merge branch 'MDL-35638-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit 76555946a9f6432c20f9012a7f52c447a34f97d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 04:50:26 +0800
Tag:    v2.9.0-beta

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

commit 583cf99ebda95cef43d5866ac767d95b7eb9672a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 04:46:41 +0800
Tag:    v2.8.2

Merge branch 'MDL-47590_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

commit 7a7ad4e500836675a48a8d3ad52611549efbb9e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 04:46:38 +0800
Tag:    v2.7.4

Merge branch 'MDL-47590_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit fea4baf826d5ff2a29da4ae0be7d558b50160725
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 04:46:35 +0800
Tag:    v2.9.0-beta

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

commit c1ca23afa3d734cb7246672fde7d3e75d14b0489
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 04:34:33 +0800
Tag:    v2.8.2

Merge branch 'MDL-44657-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE

commit 32df8695ba94d164ab3af0f034823e8ac2aa0e0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 04:34:29 +0800
Tag:    v2.7.4

Merge branch 'MDL-44657-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 6d97620481febee35804d37e68b21cc325336f56
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Nov 2014 04:34:25 +0800
Tag:    v2.9.0-beta

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

commit ecb90615b853e1c279bcb6ea68b3f73d27b6c1e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Nov 2014 07:33:43 +0800
Tag:    v2.7.4

Merge branch 'MDL-47391_M27' of github.com:ninelanterns/moodle into MOODLE_27_STABLE

commit 8aff36d0c8649b8d8edd94cb8a11c12b4c944cb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Nov 2014 07:33:25 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-47391_master' of github.com:ninelanterns/moodle

commit 8ed36ec5b0e623753ee18dd8cc70e72d1b532e23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Nov 2014 04:42:02 +0800
Tag:    v2.7.4

Merge branch 'MDL-39692-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 785887fd0f548a65f8172cb6bbd3187a760f785e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Nov 2014 04:41:58 +0800
Tag:    v2.9.0-beta

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

commit 5c4f15ae31a68a5a023c5c542c2915579bca59d6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Nov 2014 03:58:58 +0800
Tag:    v2.7.4

Merge branch 'MDL-30968-m27-forum-group-link' of https://github.com/amandadoughty/moodle into MOODLE_27_STABLE

commit 06a26e54e59e5ed9bb00a1a55212d7f387dbfbad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Nov 2014 03:58:52 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-30968-master-forum-group-link' of https://github.com/amandadoughty/moodle

commit 12a312ac6acb085999c32cd607312587bea7158b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 06 Nov 2014 06:55:46 +0800
Tag:    v2.8.0-rc2

Merge branch 'MDL-48044-master' of git://github.com/andrewnicols/moodle

commit cf033133424de48bf4b2a41bad056eeadb23d573
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Nov 2014 10:30:08 +0800
Tag:    v2.8.0-rc1

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

commit 968cc37437aae384795314411742071f6dd5281d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Nov 2014 06:27:55 +0800
Tag:    v2.8.0-rc1

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

commit 244be92c8e131e313f1d5f6a635cc02f1a2c1e21
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 31 Oct 2014 06:15:21 +0800
Tag:    v2.7.3

Merge branch 'MDL-47875_MOODLE_27_STABLE' of https://github.com/crazyserver/moodle into MOODLE_27_STABLE

commit 866551d73a96c234c87027c6cc2a1c4f592066b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 31 Oct 2014 06:15:16 +0800
Tag:    v2.6.6

Merge branch 'MDL-47875_MOODLE_26_STABLE' of https://github.com/crazyserver/moodle into MOODLE_26_STABLE

commit 323ed3bbf0d76378ee3dde683057265593e7bbbf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 31 Oct 2014 06:15:12 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle

commit 3ea5ff8941468f9b92e0c02caf06b7db2632e69c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 31 Oct 2014 05:27:46 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-42875_master' of https://github.com/crazyserver/moodle

commit db310f773732e47a51cfc972e6710d46a4753785
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Oct 2014 12:27:09 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47870-master2' of git://github.com/ankitagarwal/moodle

commit 76b6d2e75050815a2feaf66e9639ee4ddab199bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Oct 2014 09:02:28 +0800
Tag:    v2.7.3

Merge branch 'MDL-47183-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit c07cee909226ddf52e129ea54a7b40475e9eb9e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Oct 2014 09:02:24 +0800
Tag:    v2.6.6

Merge branch 'MDL-47183-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 77b31ba2ce00cf90743741fc78bf8c41f2f3b9b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Oct 2014 09:02:19 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47183-master' of git://github.com/andrewnicols/moodle

commit c18c38f3f6d2ef835cabf2e02e749c0fc693cc59
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Oct 2014 04:28:17 +0800
Tag:    v2.7.3

Merge branch 'wip-MDL-47585-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit c43bfca3387350517680aee15b96aa4f302a87db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 07:02:18 +0800
Tag:    v2.7.3

Merge branch 'MDL-46332-grouping-remove-button-27' of git://github.com/DanBennettUK/moodle into MOODLE_27_STABLE

commit a1428d4be6a32eaedcae70ddb52df3d49d77c726
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 07:02:14 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-46332-grouping-remove-button-master' of git://github.com/DanBennettUK/moodle

commit 68085f2bd5486090f313169da7cadf7aa7492ee9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 07:02:14 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-46332-grouping-remove-button-master' of git://github.com/DanBennettUK/moodle

commit 065448834c8b5d6a2b88ba29b190e94968bed881
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 06:58:36 +0800
Tag:    v2.8.0-rc1

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

commit 29a30602658b97995dbbae0685be4f934b81d1cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 06:58:36 +0800
Tag:    v2.8.0-rc1

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

commit fc91acc81384b45e7e870c92f96a29e9faa02e11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 06:23:04 +0800
Tag:    v2.8.0-rc1

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

commit 124932d223357b9a520655843c46553301fe64e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 06:23:04 +0800
Tag:    v2.8.0-rc1

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

commit 614820522f4dc88b235047d83c1ff5781c7a98c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 06:19:43 +0800
Tag:    v2.8.0-rc1

Merge branch 'm28_MDL-47632' of https://github.com/totara/moodle

commit ef547170249efe2edf9d49e7ad3659ee29682790
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 06:19:43 +0800
Tag:    v2.8.0-rc1

Merge branch 'm28_MDL-47632' of https://github.com/totara/moodle

commit 1ecb6d4d1bfe2ac1b3c83ae5f6e63f644e8f5214
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 06:17:04 +0800
Tag:    v2.7.3

Merge branch 'MDL-47555_27' of https://github.com/rlorenzo/moodle into MOODLE_27_STABLE

commit 7117571c348c454daf40d14c16ff9c650e01120b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 06:17:00 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle

commit ec998f7487f8a82ca6119da136013becc1b73969
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 06:17:00 +0800
Tag:    v2.8.0-rc1

Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle

commit 148a0db4cf4b45085cc47c541aeb15398da19a75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 04:59:01 +0800
Tag:    v2.7.3

Merge branch 'wip_MDL-47795_M27' of git://github.com/gjb2048/moodle into MOODLE_27_STABLE

commit 2df4bc7d2d05031b8acc06ce975f03b999d8289a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 04:58:57 +0800
Tag:    v2.6.6

Merge branch 'wip_MDL-47795_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE

commit 1e9756971359751ab117a8d9fe7ba03f5b1dd15a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 04:58:53 +0800
Tag:    v2.8.0-rc1

Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle

commit 18f179751749578199d556a847085e19243c4ec1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 24 Oct 2014 04:58:53 +0800
Tag:    v2.8.0-rc1

Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle

commit b12d387f930a87cea695b83de0953f8aefb19738
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Oct 2014 10:17:59 +0800
Tag:    v2.7.3

Merge branch 'm27_MDL-36669_UFO_references_in_filelib' of https://github.com/scara/moodle into MOODLE_27_STABLE

commit 0b295ad0768e1cd233e39bebc0ef1740f6f54b5d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Oct 2014 10:17:56 +0800
Tag:    v2.6.6

Merge branch 'm26_MDL-36669_UFO_references_in_filelib' of https://github.com/scara/moodle into MOODLE_26_STABLE

commit 258d9af845d18f9c9af78e1c9d0b64848a2b78d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Oct 2014 10:17:53 +0800
Tag:    v2.8.0-rc1

Merge branch 'm28_MDL-36669_UFO_references_in_filelib' of https://github.com/scara/moodle

commit 7a126c94a426eb7bb9d71a8bd9bfda7a11f945b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Oct 2014 09:44:01 +0800
Tag:    v2.8.0-rc1

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

commit 28f1bd0106016ff422b63870b4be6686a1d2aac7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Oct 2014 09:42:36 +0800
Tag:    v2.8.0-rc1

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

commit 263f8cff7e7da391a9b85b8028b420f59e23c0db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Oct 2014 09:39:34 +0800
Tag:    v2.8.0-rc1

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

commit 85e3c164795dac17427a038833200c8d9a716580
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 16 Oct 2014 06:05:02 +0800
Tag:    v2.7.3

Merge branch 'MDL-47594_M27' of git://github.com/kordan/moodle into MOODLE_27_STABLE

commit f8224f91531fd61f82d77a31f6250a4709568757
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 16 Oct 2014 06:04:57 +0800
Tag:    v2.6.6

Merge branch 'MDL-47594_M26' of git://github.com/kordan/moodle into MOODLE_26_STABLE

commit 2fdb4c6b0095e74e4309f7a0ea6211fd9410ac8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 16 Oct 2014 06:04:53 +0800
Tag:    v2.8.0-rc1

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

commit 30cc99cd983829d41e92107ac104272658212432
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 16 Oct 2014 05:31:28 +0800
Tag:    v2.7.3

Merge branch 'wip-MDL-47629-MOODLE_27_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_27_STABLE

commit 3b5e7df22286ada2db92518275a16a61154b17cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 16 Oct 2014 05:31:24 +0800
Tag:    v2.6.6

Merge branch 'wip-MDL-47629-MOODLE_26_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_26_STABLE

commit edfeca582ec7387821ca95f7b9b493f3cb46d99c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 16 Oct 2014 05:31:20 +0800
Tag:    v2.8.0-rc1

Merge branch 'wip-MDL-47629-master' of https://github.com/kwiliarty/moodle

commit 71900d9202b9315c958c8326725b74e4b096454b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 09 Oct 2014 10:44:04 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47194-master-fixes' of git://github.com/andrewnicols/moodle

commit 15dfb316cfb9f073df69e331db714a83d8f4e4cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 09 Oct 2014 04:16:47 +0800
Tag:    v2.7.3

Merge branch 'MDL-46984_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit 0cd53ea8cde725eb324770130880734d627c5ba8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 09 Oct 2014 04:16:43 +0800
Tag:    v2.6.6

Merge branch 'MDL-46984_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit b92a7dd0d84b3c9712bcf0eb47ef93f5d8b29add
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 09 Oct 2014 04:16:40 +0800
Tag:    v2.8.0-beta

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

commit 9ff13804e55e73f0843d3401e725acd316582d6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 09 Oct 2014 03:51:40 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46481-master' of https://github.com/FMCorz/moodle

commit ec39530d5fd6ac6ca192e19e50be0ebd6cdc3fc4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 09:35:02 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-47477_m28_jqueryuitheme' of https://github.com/skodak/moodle

commit 6d3b83b9b4a560849f778b351a8bbfc46a6e74e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 09:31:40 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-47303_m28_jquery' of https://github.com/skodak/moodle

commit 76d9337cedd8e87d596dcff4f1b4f8bdac14adb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 09:10:50 +0800
Tag:    v2.8.0-beta

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

commit 9311301f4401fd90792e17930f6e1da9c110865d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 09:07:57 +0800
Tag:    v2.8.0-beta

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

commit a4534af8b7a76be821e4957a734aa857163e0a7b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 07:21:41 +0800
Tag:    v2.7.3

Merge branch 'MDL-47470-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE

commit 22362b965f55f9a45c1281eeee2c73e982dae866
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 07:21:37 +0800
Tag:    v2.6.6

Merge branch 'MDL-47470-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

commit 252bd39983efe8994f98302ecbe9f53e9ebca139
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 07:21:31 +0800
Tag:    v2.8.0-beta

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

commit ba2f9a96955102e5f316e8450c0e89b406f4c55b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 07:01:42 +0800
Tag:    v2.8.0-beta

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

commit 2cfba2cb2ef3cb42f0478dc669cd4f64359ca5a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:52:23 +0800
Tag:    v2.7.3

Merge branch 'MDL-47474-27' of https://github.com/bostelm/moodle into MOODLE_27_STABLE

commit 13f60ffce1a6b0ae9830a668e8125f76dc3904cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:52:17 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47474' of https://github.com/bostelm/moodle

commit 80165b6ee814e3926b4e9ce89f50db0de7a78132
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:51:38 +0800
Tag:    v2.7.3

Merge branch 'MDL-47481-m27' of https://github.com/sammarshallou/moodle into MOODLE_27_STABLE

commit 28fffe1f9bd7ccb8dba5823d57849450ac8fb7e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:51:32 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47481-master' of https://github.com/sammarshallou/moodle

commit 2e16cac8a23576a069fd59e382389c28ca63f178
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:40:53 +0800
Tag:    v2.7.3

Merge branch 'MDL-47484_27' of git://github.com/aolley/moodle into MOODLE_27_STABLE

commit 15a41395063319c5b8729d59a671472b395bdad0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:40:49 +0800
Tag:    v2.8.0-beta

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

commit c5057d3ecce200076241e71909468a27466188b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:37:24 +0800
Tag:    v2.8.0-beta

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

commit 0ebe4f74aa33849943689b3d690fe32901321f4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:36:01 +0800
Tag:    v2.8.0-beta

Merge branch 'wip-MDL-40351-master' of https://github.com/marinaglancy/moodle

commit 80802921d4f386f2b1cfe13e11946f79e6f9fe25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:28:32 +0800
Tag:    v2.7.3

Merge branch 'MDL-46182_MOODLE_27_STABLE' of https://github.com/NeillM/moodle into MOODLE_27_STABLE

commit 99324aaa38bbbb2bcc90ad15de2287d86470da96
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:28:26 +0800
Tag:    v2.6.6

Merge branch 'MDL-46182_MOODLE_26_STABLE' of https://github.com/NeillM/moodle into MOODLE_26_STABLE

commit 2b17072b594cbc5b281734e74c9385747445c023
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:28:19 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46182' of https://github.com/NeillM/moodle

commit c709fafc6e6567b4ebe437bcb502b6b9c0bcb402
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:16:54 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47197-master' of git://github.com/andrewnicols/moodle

commit 70b370982f82a03ba4c6538e56ce72b40649e643
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 06:02:38 +0800
Tag:    v2.8.0-beta

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

commit e3eea31d675db585f8973326b1653ad8d9536a01
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 05:57:22 +0800
Tag:    v2.7.3

Merge branch 'MDL-28075_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit c73108bb4d0ce6e482e028c33b93dd025ddacfed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 05:57:18 +0800
Tag:    v2.6.6

Merge branch 'MDL-28075_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 0c1a1760fa4ae453c15be1f6d5c9c8c20c277bd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 05:57:15 +0800
Tag:    v2.8.0-beta

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

commit dae0eba25306902e5271ced7de1a5f691365eab9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 05:45:37 +0800
Tag:    v2.7.3

Merge branch 'MDL-46391-27' of https://github.com/DmitryNefedov/moodle into MOODLE_27_STABLE

commit e06146cea9e31ac940dc969729549430f0cc661a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 05:45:29 +0800
Tag:    v2.6.6

Merge branch 'MDL-46391-26' of https://github.com/DmitryNefedov/moodle into MOODLE_26_STABLE

commit be8989065c3b1752aea5abbd63328c47d8cd0c1f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 05:45:23 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46391-master' of https://github.com/DmitryNefedov/moodle

commit 82d9aebc7dac9110fc62134634caeb144c410b30
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Oct 2014 04:39:01 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle

commit 94cdabcdee13d57206c545a3cb50b3aa976180ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Oct 2014 11:28:50 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle

commit 4e6d7fb30b8aacf1b20242810046b34b43d1c6e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Oct 2014 10:16:59 +0800
Tag:    v2.7.3

Merge branch 'MDL-36460-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 534e4706b732a6ecce6273ad6fa3243c135c5d21
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Oct 2014 10:16:56 +0800
Tag:    v2.6.6

Merge branch 'MDL-36460-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 002ee6faab6c0105d343206c6d60477f86585048
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Oct 2014 10:16:54 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-36460-master' of git://github.com/andrewnicols/moodle

commit 98844557aed874e4136b484ecb43c7ad9c27f6d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Oct 2014 05:36:53 +0800
Tag:    v2.7.3

Merge branch 'MDL-46295-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

commit 3ba4e595fb5cffd6cd7f486521a063dea6dfe0b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Oct 2014 05:36:48 +0800
Tag:    v2.8.0-beta

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

commit d5eea92499f3c92191b07aa95b423957c801fe16
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Oct 2014 05:26:25 +0800
Tag:    v2.7.3

Merge branch 'MDL-46978-27' of https://github.com/danielneis/moodle into MOODLE_27_STABLE

commit d5f68fcfdc687056c105614c0dcba3ae89bfe605
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Oct 2014 05:26:19 +0800
Tag:    v2.6.6

Merge branch 'MDL-46978-26' of https://github.com/danielneis/moodle into MOODLE_26_STABLE

commit f46606936ab73e394b6bcf42663ad1fed766cca4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Oct 2014 05:26:05 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46978' of https://github.com/danielneis/moodle

commit b2ea05408193a27d2a0b0bf09be2b48f23963865
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Oct 2014 06:15:50 +0800
Tag:    v2.7.3

Merge branch 'm27_MDL-47316' of git://git.catalyst.net.nz/moodle-r2 into MOODLE_27_STABLE

commit 8d099a71d034d4c6979f8148936af84e3dc7fad4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Oct 2014 06:15:47 +0800
Tag:    v2.6.6

Merge branch 'm26_MDL-47316' of git://git.catalyst.net.nz/moodle-r2 into MOODLE_26_STABLE

commit 7b08f6e888c6ff8c543132e5777d3bb3d3dc062a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Oct 2014 06:15:44 +0800
Tag:    v2.8.0-beta

Merge branch 'master_MDL-47316' of git://git.catalyst.net.nz/moodle-r2

commit 79eefed3c8ea5bc43f24bdaf94bebcf2163fade6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Oct 2014 06:10:19 +0800
Tag:    v2.8.0-beta

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

commit 127ef54082c83a5edb0f447eec8f2cef25b094e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Oct 2014 05:44:30 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45374' of git://github.com/jleyva/moodle

commit 00c7641fb70f383a19d4f01f80a945cf9d685463
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 02 Oct 2014 12:31:25 +0800
Tag:    v2.6.6

Merge branch 'MDL-47408-26' of https://github.com/DmitryNefedov/moodle into MOODLE_26_STABLE

commit 670eb0f1710731ba0cd8f06130be7abe3d65396f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 02 Oct 2014 12:31:10 +0800
Tag:    v2.7.3

Merge branch 'MDL-47408-27' of https://github.com/DmitryNefedov/moodle into MOODLE_27_STABLE

commit 251089fe4475cf24b9f72d732511d3058d70a19c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 02 Oct 2014 12:30:47 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle

commit f0f3d01025362cb8dae776b5e73f9e6a42ba6147
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 Oct 2014 10:38:07 +0800
Tag:    v2.7.3

Merge branch 'm27_MDL-47404' of https://github.com/danmarsden/moodle into MOODLE_27_STABLE

commit 724aa37de9a4ff804e7e04de0b085e17a72bc09c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 Oct 2014 10:38:02 +0800
Tag:    v2.6.6

Merge branch 'm26_MDL-47404' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit db89450d85910db010ebde572d072b28793dad56
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 Oct 2014 10:37:56 +0800
Tag:    v2.8.0-beta

Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle

commit db34f8cbdb530659190353f786c9c0d062b1c2b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 Oct 2014 03:57:37 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle

commit 6caf85e6d658b6e1aa0be3955d851eba410ec21a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Sep 2014 06:28:26 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46084-master' of https://github.com/sbourget/moodle

commit ff28497a1d8e4bbc6e2c343acc3d11a600738436
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Sep 2014 05:35:47 +0800
Tag:    v2.8.0-beta

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

commit ca4bb8441caee2d62bccf749256ba631aa80d488
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Sep 2014 05:03:17 +0800
Tag:    v2.7.3

Merge branch 'm27_MDL-47170' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit 27499a59d6b0763548e80f8dfd2dae321eb9c5a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Sep 2014 05:03:12 +0800
Tag:    v2.6.6

Merge branch 'm26_MDL-47170' of https://github.com/totara/moodle into MOODLE_26_STABLE

commit 2957fdddd54c9f1bfca9e33c0d930c1b011d1475
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Sep 2014 05:03:06 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-47170' of https://github.com/totara/moodle

commit 3cfbdd9e5a2aaa1be1e5327515b4570dc0090149
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Sep 2014 04:52:54 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle

commit 66570944173fa0eeccb25a4f5eb2468a76ac4d06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Sep 2014 03:48:28 +0800
Tag:    v2.7.3

Merge branch 'MDL-47214-ClientIp-wrong-with-multiple-proxies_27_STABLE' of https://github.com/mhughes2k/moodle into MOODLE_27_STABLE

commit fc2856aab1d54c6fe2fe573592e005a82662b3c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Sep 2014 03:48:20 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47214-ClientIp-wrong-with-multiple-proxies' of https://github.com/mhughes2k/moodle

commit 6e0760db2b6d91229d59dce7dd21d27db6099446
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 10:18:09 +0800
Tag:    v2.7.3

Merge branch 'MDL-47033_27' of https://github.com/totara/openbadges into MOODLE_27_STABLE

commit c2f9e31e7428f2f3104182766bce30bc56c75826
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 10:18:06 +0800
Tag:    v2.6.6

Merge branch 'MDL-47033_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit 525b6ebeb9c4698908162e0f3bec6674d2bce8c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 10:18:03 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges

commit fcf0cc04b34616911b909108d4834621dcc2cd7a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 10:17:24 +0800
Tag:    v2.8.0-beta

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

commit 55f0eb8328bdf818b7533dbbfcf8e459ed929140
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 10:15:47 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-47300_m28_tcpdf' of https://github.com/skodak/moodle

commit 1fcb39fbb250289277f428705a27417f7d6388e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:35:15 +0800
Tag:    v2.7.3

Merge branch 'wip-MDL-47398-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit eb5b0622b05492928d24d308a0b748e1c4795174
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:35:10 +0800
Tag:    v2.6.6

Merge branch 'wip-MDL-47398-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit a9a09787e47a9ac4edd0d28e85dd5c6d53467b45
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:35:06 +0800
Tag:    v2.8.0-beta

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

commit 3d9daae5a9e64fa3b2ed5481824d1ab0286e88d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:32:51 +0800
Tag:    v2.7.3

Merge branch 'MDL-47408-27' of https://github.com/DmitryNefedov/moodle into MOODLE_27_STABLE

commit 40eb3d691cf3def0bbda8468d778decd655a4c2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:32:44 +0800
Tag:    v2.6.6

Merge branch 'MDL-47408-26' of https://github.com/DmitryNefedov/moodle into MOODLE_26_STABLE

commit 71668d2efcdea4d6f963d61ec797f6974de1566a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:32:38 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle

commit 5f78ef781fccb620bd9d708d7be57e317da0acfe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:23:31 +0800
Tag:    v2.7.3

Merge branch 'm27_MDL-47404' of https://github.com/danmarsden/moodle into MOODLE_27_STABLE

commit 8590c0e79810eca2746978147f2a43ba49618520
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:23:26 +0800
Tag:    v2.6.6

Merge branch 'm26_MDL-47404' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit ddd0d4a56bd7f8893d5787ef6f06e0100874ac01
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:23:18 +0800
Tag:    v2.8.0-beta

Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle

commit b87711a0dce4a53640d26b9bb45623b22d4149a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:21:39 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle

commit c05e69c836493bd28500f315ade1514cffb94b06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:20:08 +0800
Tag:    v2.7.3

Merge branch 'MDL-39190_27' of https://github.com/pauln/moodle into MOODLE_27_STABLE

commit 6abdfab12f366c89acbcb621af85e559a86e1d68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:20:02 +0800
Tag:    v2.6.6

Merge branch 'MDL-39190_26' of https://github.com/pauln/moodle into MOODLE_26_STABLE

commit 503324d24150437eefc0aee235d446d086466bbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:19:52 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-39190' of https://github.com/pauln/moodle

commit a93039706c533737743fb128b9fe2b601d0cd7b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 09:00:42 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-20250_grade_settings2' of https://github.com/andyjdavis/moodle

commit dfefc00f561aba61a0366882dc5065da5794cfd1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 06:35:32 +0800
Tag:    v2.7.3

Merge branch 'MDL-37707-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 811f235fb64daa88bceb89a41e01163a4e57a5de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 06:35:27 +0800
Tag:    v2.6.6

Merge branch 'MDL-37707-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit e0533f263340b53e3d6667a6f1a1b4082aea4164
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 06:35:23 +0800
Tag:    v2.8.0-beta

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

commit 3f6243f4be52c003bedb8bd959e079dcab12f261
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 06:21:24 +0800
Tag:    v2.7.3

Merge branch 'MDL-42974-m27' of https://github.com/sammarshallou/moodle into MOODLE_27_STABLE

commit cec3ac8baf5cadba5914744e33cb07522fc984bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 06:21:19 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-42974-master' of https://github.com/sammarshallou/moodle

commit 015d47f67d0cae21eb6ce7692230ecd0151b3efa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 06:19:10 +0800
Tag:    v2.7.3

Merge branch 'MDL-47378-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE

commit 51606b8e63b55bdf5727d03c5a082f47328b3ecd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 06:19:06 +0800
Tag:    v2.8.0-beta

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

commit 37fe4b68eaf0a16ad0380dbaf6d0d89829793452
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 04:51:45 +0800
Tag:    v2.7.3

Merge branch 'MDL-43566-27' of https://github.com/willylee/moodle into MOODLE_27_STABLE

commit 9ff32d8533865f035f9559ca8378923f2ec3247f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 04:51:40 +0800
Tag:    v2.6.6

Merge branch 'MDL-43566-26' of https://github.com/willylee/moodle into MOODLE_26_STABLE

commit 29b72af1b21eab1fa5876dba999eb9b9a30cb120
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 04:51:35 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-43566' of https://github.com/willylee/moodle

commit d672e25b6cff3071b6d0d00175152102b42fb544
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 04:11:25 +0800
Tag:    v2.8.0-beta

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

commit 95944b32fd231050ff690d607b81468caf806403
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 04:06:42 +0800
Tag:    v2.7.3

Merge branch 'MDL-47381_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit 1e26495fc708d278e769a7f637553ce2fcf752cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 04:06:39 +0800
Tag:    v2.6.6

Merge branch 'MDL-47381_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 3604d399e34f3bb1ab260758929e9b1420feef82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 04:06:35 +0800
Tag:    v2.8.0-beta

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

commit 7686d4b3b73532ca24c2a0149e62fac1187b48e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 04:02:57 +0800
Tag:    v2.7.3

Merge branch 'MDL-47380-m27' of https://github.com/sammarshallou/moodle into MOODLE_27_STABLE

commit c8674e5ca5ad27da67a822282071016de2d21ffa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 04:02:52 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47380-master' of https://github.com/sammarshallou/moodle

commit a038c1e0a3ad370165a27304ac2078198c540481
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Sep 2014 03:43:51 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47252-master' of git://github.com/gurgus/moodle

commit d56c53c90e413ad6dd1d692c056bfd958ec5934f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Sep 2014 12:36:14 +0800
Tag:    v2.7.3

Merge branch 'MDL-46811-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE

commit e971132854e15e8ac71ac101a564b4e09f03559b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Sep 2014 12:36:09 +0800
Tag:    v2.6.6

Merge branch 'MDL-46811-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

commit 4356012960130469b05e6a41accf6fe620e3e6d6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Sep 2014 12:36:05 +0800
Tag:    v2.8.0-beta

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

commit 7fca0ced0aafb465196f7764ebc6a8bb16384b31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Sep 2014 12:32:09 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47244-master' of git://github.com/jethac/moodle

commit b32e1778bb8063c573b8b54e56ebaba8f76bd466
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Sep 2014 11:26:06 +0800
Tag:    v2.8.0-beta

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

commit be91dff8bb91e8762a6d954f37f62537f38ad843
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Sep 2014 08:23:08 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-47242-master' of git://github.com/jethac/moodle

commit 8bcc9fbff770ecca53659bb9c2e2c79b743d5740
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Sep 2014 08:04:31 +0800
Tag:    v2.7.3

Merge branch 'MDL-47242-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

commit dc58a459c3b8b06974e3312fa923e938549ac45b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Sep 2014 08:04:29 +0800
Tag:    v2.6.6

Merge branch 'MDL-47242-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE

commit efe3aefaf2c8f3b86b653e8d6e8de4975bb6d6f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 12:15:24 +0800
Tag:    v2.8.0-beta

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

commit 95924516fa0aad4ad28b689b4dfaeb61d7e5d101
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 11:51:09 +0800
Tag:    v2.7.2

Merge branch 'MDL-43908-MOODLE_27_STABLE' of https://github.com/lucisgit/moodle into MOODLE_27_STABLE

commit 23bf420120018a9892f308a848c1b4e4b35e1e90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 11:51:03 +0800
Tag:    v2.6.5

Merge branch 'MDL-43908-MOODLE_26_STABLE' of https://github.com/lucisgit/moodle into MOODLE_26_STABLE

commit 6df4025b2c5a0a74c35337b1f7e7a0c2b83e1cff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 11:50:50 +0800
Tag:    v2.8.0-beta

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

commit 1663aa1fb9cf63282b556b7023f401b3fe563376
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 11:47:22 +0800
Tag:    v2.7.2

Merge branch 'MDL-45041_27_STABLE' of git://github.com/jleyva/moodle into MOODLE_27_STABLE

commit 5175bb487ef249bc579c6a085a25a3dfa13030a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 11:47:18 +0800
Tag:    v2.6.5

Merge branch 'MDL-45041_26_STABLE' of git://github.com/jleyva/moodle into MOODLE_26_STABLE

commit 6239a2358fe4ad5842dfbc9248933b73465ebe40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 11:47:13 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45041' of git://github.com/jleyva/moodle

commit 970536b659d321788c42474e028649b9450b12b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 11:44:34 +0800
Tag:    v2.7.2

Merge branch 'MDL-46460_27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE

commit fe5bf6ee81ad7f48180c1ad31d24160d979b3a12
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 11:44:31 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46460' of git://github.com/jleyva/moodle

commit 4a928b9dfcb50b170e3ad2f94541d4091513ca4d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 05:37:44 +0800
Tag:    v2.8.0-beta

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

commit adac041f8c36ed31c724f9e38570138d921634ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 04:47:00 +0800
Tag:    v2.7.2

Merge branch 'MDL-45044-m27-master' of https://github.com/dthies/moodle into MOODLE_27_STABLE

commit 98311522edaed6f45b6cf9649b8cd82b7dd1bf61
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 04:46:55 +0800
Tag:    v2.6.5

Merge branch 'MDL-45044-m26-master' of https://github.com/dthies/moodle into MOODLE_26_STABLE

commit 964b220c83fd607fbf996b6f1b1a08721273d79d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 04:46:49 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45044-master' of https://github.com/dthies/moodle

commit 72655d053990ceff96dcbb84e396dd96543355c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 04:42:56 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46446_rating_style' of https://github.com/andyjdavis/moodle

commit dc7fe6acca4a738f8f36d67526a877ca93fc4f39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 09:25:19 +0800
Tag:    v2.7.2

Merge branch 'wip_MDL-46449_m27_loginblock' of https://github.com/skodak/moodle into MOODLE_27_STABLE

commit 62d61619e80523e13b6f570fd9e130659c0a0d2e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 09:25:13 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-46449_m28_loginblock' of https://github.com/skodak/moodle

commit 9834bce7004ca403d817617fd8e2ceeea1b2444a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 09:07:27 +0800
Tag:    v2.8.0-beta

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

commit 786a6227d06ea5dba0ec3f527d6e93f6dfeea200
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 08:22:51 +0800
Tag:    v2.7.2

Merge branch 'MDL-43390_27' of git://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit 33906441562aade04dcca102010e1130b86aed54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 08:22:45 +0800
Tag:    v2.6.5

Merge branch 'MDL-43390_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 8d4da7c01031b590747d845965c5c9a27c1b9089
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 08:22:40 +0800
Tag:    v2.8.0-beta

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

commit fd9ee7dd8bd95fc95fa293646f5f443e049ebe06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 08:13:53 +0800
Tag:    v2.7.2

Merge branch 'wip-MDL-46525-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit fcb1e8a9c25e1660e60b0f26e7d61bcfda7eca44
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 08:13:48 +0800
Tag:    v2.6.5

Merge branch 'wip-MDL-46525-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 9894b272c58fd7acecc4cdc16a928dda04ba0dee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 08:13:44 +0800
Tag:    v2.8.0-beta

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

commit cb2ca9b9cc80ca25b70e3f5ded628de8e5ae8e34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 08:10:03 +0800
Tag:    v2.8.0-beta

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

commit 8ba664e245371b85c7991c733819657469c5f911
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 04:46:11 +0800
Tag:    v2.7.2

Merge branch 'MDL-46506-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

commit cedd791b193c4b5d1f89d6b5cd56c93a7d6fe6aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 04:46:07 +0800
Tag:    v2.6.5

Merge branch 'MDL-46506-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit db28260c29b695dbd9b9f3f4e0ae41ea88178a36
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 04:46:03 +0800
Tag:    v2.8.0-beta

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

commit 896506e4df11ea40ebb8105724deef006b8d39c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 04:37:42 +0800
Tag:    v2.8.0-beta

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

commit 0cc8a0b4b2150c9dca42a542dc783e2a7517208c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jul 2014 07:12:17 +0800
Tag:    v2.7.2

Merge branch 'MDL-45594_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE

commit 9e32e3befcef51be950282c24c03174986b14005
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jul 2014 07:12:13 +0800
Tag:    v2.6.5

Merge branch 'MDL-45594_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE

commit fe43ab9b75a6f78f86525be8b309e66c162b2957
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jul 2014 07:12:09 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle

commit 6d32f6300e61072e11ad55dc68f7df29be921d1b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jul 2014 05:49:10 +0800
Tag:    v2.7.2

Merge branch 'MDL-43063-27' of git://github.com/lameze/moodle into MOODLE_27_STABLE

commit 695553b1a5dae515c0577c62d45a239aef63ee63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jul 2014 05:49:07 +0800
Tag:    v2.6.5

Merge branch 'MDL-43063-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE

commit 3e2af223273fcd008a136c15a587475f5b04081b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jul 2014 05:49:03 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-43063-master' of git://github.com/lameze/moodle

commit 94f03497450b8762fa7617de625348a8e0451629
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 07:35:54 +0800
Tag:    v2.7.2

Merge branch 'MDL-42909-27' of git://github.com/phalacee/moodle into MOODLE_27_STABLE

commit e8b0dadd6b172bb403d09546df3238d21b6d5293
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 07:35:50 +0800
Tag:    v2.6.5

Merge branch 'MDL-42909-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE

commit d90b055ab191113c0d244b12937527de79075449
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 07:35:47 +0800
Tag:    v2.8.0-beta

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

commit 424033b780728ba7f1007e13538840661f803862
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 07:32:09 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL40479_Grading_alert_colour' of https://github.com/Dave-B/moodle

commit ce3d7d5da9cbabd9b978bc7fc79258bee691b8d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 07:14:30 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-46406' of https://github.com/totara/moodle

commit 28d6752d078c9b5608ed516f6a1459fe614e7c43
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 07:12:11 +0800
Tag:    v2.7.2

Merge branch 'mdl-46427-m27' of git://github.com/deraadt/moodle into MOODLE_27_STABLE

commit 2e8d176e271505aeee28280a66d54e2dd047d30f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 07:12:08 +0800
Tag:    v2.6.5

Merge branch 'mdl-46427-m26' of git://github.com/deraadt/moodle into MOODLE_26_STABLE

commit 365e80ba7680270dbac72d0c974ec4cf5166870c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 07:12:05 +0800
Tag:    v2.8.0-beta

Merge branch 'mdl-46427-master' of git://github.com/deraadt/moodle

commit ce61d62c5ef001d913103279addb4c2b37f51e79
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 06:55:08 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46159-wip' of https://github.com/willylee/moodle

commit 93d7596d3fce905e0c4a8b4a5e20bd75884dc5f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 06:49:33 +0800
Tag:    v2.7.2

Merge branch 'MDL-45339-27' of git://github.com/xow/moodle into MOODLE_27_STABLE

commit 997be8cd2dbf53a2b297c2538ef449b2d4962734
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 06:49:29 +0800
Tag:    v2.6.5

Merge branch 'MDL-45339-26' of git://github.com/xow/moodle into MOODLE_26_STABLE

commit 8d3a4d759743ff4c403f1bdd7560f0f0212c602f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 06:49:25 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45339-master' of git://github.com/xow/moodle

commit aa9f17df928902cc90bf02f11c7ed6dbc86f22d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 06:45:43 +0800
Tag:    v2.7.2

Merge branch 'm27_MDL-46363' of https://github.com/danmarsden/moodle into MOODLE_27_STABLE

commit 6958e7ebb03d48b85d6ef4fd81ed8535b01475b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 06:45:38 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46363' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 69286e3b491b6b7ef838bba7d56a16177cf085a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 06:45:33 +0800
Tag:    v2.8.0-beta

Merge branch 'master_MDL-46363' of https://github.com/danmarsden/moodle

commit a3f41f58404864059ea5f24842fee0e04022978d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 06:42:35 +0800
Tag:    v2.6.5

Merge branch 'wip-mdl-46372-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit e6330e5ba8b762c4832c4bb51310455d2c8f006b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Jul 2014 11:16:07 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle

commit 9a97cac457bebde0cd30a063189444655b7d4fd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jul 2014 05:04:01 +0800
Tag:    v2.8.0-beta

Merge branch 'wip-mdl-45991' of https://github.com/rajeshtaneja/moodle

commit 6a91c41a49eb6676a519a798dc5c6e855a0aa934
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jul 2014 08:07:05 +0800
Tag:    v2.8.0-beta

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

commit 2c3d6f240fe3d00fe199ef434991a9218ce6284d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jul 2014 06:32:28 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46346_blog' of https://github.com/andyjdavis/moodle

commit 9b3b730c62baf3f7322907d55b4ccfb5974aebf3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jul 2014 04:48:55 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle

commit 522cbb467c26b2f2ca317cb02b61609d0be04b2e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jul 2014 04:41:46 +0800
Tag:    v2.6.5

Merge branch 'MDL-42179-003-26' of https://github.com/dbezborodovrp/moodle into MOODLE_26_STABLE

commit 7c5d28c26c513e3e521de5cc43eebfdd4b41de35
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jul 2014 04:41:31 +0800
Tag:    v2.7.2

Merge branch 'MDL-42179-003-27' of https://github.com/dbezborodovrp/moodle into MOODLE_27_STABLE

commit 5c9ba23a68b2b35af37a1ea8c174f6970053ba7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jul 2014 04:39:37 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-42179-003-master' of https://github.com/dbezborodovrp/moodle

commit 85cd13b837d4de894da9ec5a06ad0b31c1383bd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 11:28:01 +0800
Tag:    v2.6.5

Merge branch 'MDL-42214_popup_blocked_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit ba03dc18ad788987bc7c9dc544b467d507bc811c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 11:27:46 +0800
Tag:    v2.7.2

Merge branch 'MDL-42214_popup_blocked_27' of https://github.com/andyjdavis/moodle into MOODLE_27_STABLE

commit ceeb287740a1ab6cd77a2092574eb6c6b27b4cd7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 11:27:16 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-42214_popup_blocked' of https://github.com/andyjdavis/moodle

commit 628e818be26460d8f2ee6d55f857c637f6953c8b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 11:19:21 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45991_master' of https://github.com/Syxton/moodle

commit ff12f87c6276fdc1fed97ab0b0f0cbb21ad6db7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 11:16:11 +0800
Tag:    v2.6.5

Merge branch 'MDL-46073_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit 7c15d3b34c42c42b76b7ee4d7f66244b0de9c980
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 11:15:57 +0800
Tag:    v2.7.2

Merge branch 'MDL-46073_27' of https://github.com/totara/openbadges into MOODLE_27_STABLE

commit 1cae31e8c7772a7b8e847adc962d33312289c001
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 11:14:49 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46073_master' of https://github.com/totara/openbadges

commit 4a8103d97b89f4495b27680ad0f4262ce47ae8c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 08:10:03 +0800
Tag:    v2.6.5

Merge branch 'MDL-45765-moodle26' of https://github.com/StudiUM/moodle into MOODLE_26_STABLE

commit ae59c35eb900368ea1f1232976682e7ba93c3dc5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 08:09:50 +0800
Tag:    v2.7.2

Merge branch 'MDL-45765-moodle27' of https://github.com/StudiUM/moodle into MOODLE_27_STABLE

commit 2cd64c93a07438485c7aee6d362f8b0bb0d47dbf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 08:09:29 +0800
Tag:    v2.8.0-beta

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

commit eb5942ea9d2199bd921c832174147716e4bcba28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 07:55:02 +0800
Tag:    v2.8.0-beta

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

commit 050720be909b2fcbf1762aa9051e855ef3b5f100
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 06:40:37 +0800
Tag:    v2.7.2

Merge branch 'MDL-46138-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

commit b7a9846a263f5130e06a1d66e8d59a7ba5cf442e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 06:39:54 +0800
Tag:    v2.8.0-beta

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

commit 571516003b255408cb6c79bbc5052e13096ba46b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 06:32:53 +0800
Tag:    v2.6.5

Merge branch 'wip-MDL-46280-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 7573d5ff21fd5f3d6f8211df606474269bca139d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 06:32:42 +0800
Tag:    v2.7.2

Merge branch 'wip-MDL-46280-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 080fdf0533bada2fc10909f622fbde8324add12c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 06:32:28 +0800
Tag:    v2.8.0-beta

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

commit 83240842995222af6c3cfda5901b0f34bf7aa393
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 06:21:13 +0800
Tag:    v2.8.0-beta

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

commit 94dab2abb3a32712ee23d489b592434ee641592e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 06:12:16 +0800
Tag:    v2.8.0-beta

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

commit 804c22b8f1eadcf09ad7b422e9378cdd670ea417
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 05:51:39 +0800
Tag:    v2.7.2

Merge branch 'MDL-31089_27' of git://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit cfaf9dc5a74a42af28552f3cc51f836ea019c50b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 05:51:27 +0800
Tag:    v2.6.5

Merge branch 'MDL-31089_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 23dab427de7b2d8d0777051b94565215873534a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 04:41:53 +0800
Tag:    v2.6.5

Merge branch 'MDL-45562-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE

commit 8716b6c89fb75f335c67c4810cb6997c19eb8598
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 04:41:38 +0800
Tag:    v2.7.2

Merge branch 'MDL-45562-27' of git://github.com/lameze/moodle into MOODLE_27_STABLE

commit 961484d41eb1a4a473b6b06fa8addbec0d9f3296
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 11:15:12 +0800
Tag:    v2.8.0-beta

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

commit 20c80d9e2f436f93636aad43bd3fd34e052a1835
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 10:40:17 +0800
Tag:    v2.6.4

Merge branch 'MDL-46248_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit 4eacb77012d6414a16c2701496b58aa0da288d4e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 10:28:02 +0800
Tag:    v2.7.1

Merge branch 'MDL-46016_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE

commit fc22f80e9c734d06c1b687361c9ad86848bfb5a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 10:27:55 +0800
Tag:    v2.6.4

Merge branch 'MDL-46016_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit 94b956d3ec77e0273d4bfac3f48255e8dcee1218
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 10:27:47 +0800
Tag:    v2.8.0-beta

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

commit a238e7ed72feaffa5bb1ff6f49ab032731422ef9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:53:52 +0800
Tag:    v2.7.1

Merge branch 'MDL-19270_moodle27stable' of https://github.com/nadavkav/moodle into MOODLE_27_STABLE

commit fadff0062aee6aa7dc7bdae8aa2ff4ed2d0053f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:53:47 +0800
Tag:    v2.6.4

Merge branch 'MDL-19270_moodle26stable' of https://github.com/nadavkav/moodle into MOODLE_26_STABLE

commit d320391099260846319bad2a83e74703a3467f70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:53:40 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle

commit 98ac33bcb0add1271ca3e7d3a8d3419cda4e40c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:38:08 +0800
Tag:    v2.7.1

Merge branch 'MDL-46200-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE

commit 7044c6be1fd898e22c34254b91bcf94792d4cd7a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:38:04 +0800
Tag:    v2.8.0-beta

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

commit 0caa8c60d21a5189705371b8673b8b5c11e441fa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:26:58 +0800
Tag:    v2.7.1

Merge branch 'mdl45982-moodle27' of https://github.com/tlock/moodle into MOODLE_27_STABLE

commit 849c19022c922e5d39df49fd59f07872e4dc9c55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:26:51 +0800
Tag:    v2.6.4

Merge branch 'mdl45982-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE

commit 189f9937ad7a1dff8187a271f039b92f657ca577
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:26:36 +0800
Tag:    v2.8.0-beta

Merge branch 'mdl45982-master' of https://github.com/tlock/moodle

commit 2dbdaedc3ed3916bd3c8e4679d9c31dd4bded37a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:10:36 +0800
Tag:    v2.7.1

Merge branch 'm27_MDL-46144' of https://github.com/totara/moodle into MOODLE_27_STABLE

commit 0076ac2d1c1401c4f6979e78e45b2db60d17f672
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:10:33 +0800
Tag:    v2.6.4

Merge branch 'm26_MDL-46144' of https://github.com/totara/moodle into MOODLE_26_STABLE

commit bac04a65bbd7fa1f6e35cf6089f8fba3c583844d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:10:30 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-46144' of https://github.com/totara/moodle

commit 2f8cf358113d9782c98f4c5617c04db95bfea86f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:10:24 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-46193' of git://github.com/mr-russ/moodle

commit 95d294368fa5fa31ce546e84a363a152e8422175
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 07:43:09 +0800
Tag:    v2.8.0-beta

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

commit 6d05bee94028ac6f334d87ba41a4d9b6f2ba98ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 06:45:01 +0800
Tag:    v2.7.1

Merge branch 'MDL-46212_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

commit cf9ae1134ccc74602ff228d04080d80887c1a043
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 06:36:10 +0800
Tag:    v2.8.0-beta

Merge branch 'm28_MDL-46225' of https://github.com/totara/moodle

commit 2535dfaf646c36a2c27f62274ea3ba899a52d990
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 06:34:30 +0800
Tag:    v2.7.1

Merge branch 'MDL-46240-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE

commit a5dcdd4bd9584e34cd01372fcaa77c78734b22f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 06:34:28 +0800
Tag:    v2.8.0-beta

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

commit 6b6affec1f52753eccfc886929ac32cdaafbe8c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:42:51 +0800
Tag:    v2.7.1

Merge branch 'MDL-45678-006-27' of https://github.com/dbezborodovrp/moodle into MOODLE_27_STABLE

commit 8ce2f33f9e25666bfab43de5fbe13e280db67013
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:42:43 +0800
Tag:    v2.6.4

Merge branch 'MDL-45678-006-26' of https://github.com/dbezborodovrp/moodle into MOODLE_26_STABLE

commit 207891d791913d11489d7b8f3e8cfa89a9164f49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:42:35 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45678-006-master' of https://github.com/dbezborodovrp/moodle

commit 9e13649c89ffeaf1f1d9219c41ba14227b88587a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:37:20 +0800
Tag:    v2.7.1

Merge branch 'wip_MDL-46126_m27_passnulls' of https://github.com/skodak/moodle into MOODLE_27_STABLE

commit ca13549a89eebf3bbdf70833613d4c03bf6a8a3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:37:14 +0800
Tag:    v2.6.4

Merge branch 'wip_MDL-46126_m26_passnulls' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit a02656b75a7b77b72a5dbfbcf7812750c7e22790
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:37:08 +0800
Tag:    v2.8.0-beta

Merge branch 'wip_MDL-46126_m28_passnulls' of https://github.com/skodak/moodle

commit f549deed15d60cf87d1f86a92260f7640193db67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:28:31 +0800
Tag:    v2.7.1

Merge branch 'MDL-43347-27' of https://github.com/mackensen/moodle into MOODLE_27_STABLE

commit 20e563e82518af24460cdf088e4e6a0057cc51c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:28:25 +0800
Tag:    v2.6.4

Merge branch 'MDL-43347-26' of https://github.com/mackensen/moodle into MOODLE_26_STABLE

commit 4264ed8454b0b976f6c7eec158ec660b1d5feb69
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:28:20 +0800
Tag:    v2.8.0-beta

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

commit 744c77c0578d1c68fd82c290f677ecf74866e348
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 04:29:45 +0800
Tag:    v2.8.0-beta

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

commit fe22c729ffe5ccab71d72e9462798879286cbb44
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Jul 2014 11:13:18 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle

commit da6ddbf8e64816275bedfa01411d708140fd9b20
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Jul 2014 05:31:34 +0800
Tag:    v2.8.0-beta

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

commit d683942c6a6c87165c5d06e25fd56c9d3d2b8019
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Jul 2014 05:31:25 +0800
Tag:    v2.7.1

Merge branch 'wip-MDL-46147-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

commit 2ce17661e8307e31ec6bbc6fbce85003b42a5b47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Jul 2014 05:31:10 +0800
Tag:    v2.6.4

Merge branch 'wip-MDL-46147-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 4c92c676e310c30b3056167cf653fcad23d146c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Jul 2014 05:21:29 +0800
Tag:    v2.8.0-beta

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

commit 21e57e82ed57900953d19d6f5ea4cfd0b35856e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Jul 2014 07:27:53 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle

commit b23bc0a14875262fb55b6e62df6bd1e97edbd425
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Jul 2014 05:06:20 +0800
Tag:    v2.7.1

Merge branch 'MDL-40805-27' of git://github.com/lameze/moodle into MOODLE_27_STABLE

commit 3bbb37741f0a1c46e958f8f9df4449ec62712ee3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Jul 2014 05:06:16 +0800
Tag:    v2.6.4

Merge branch 'MDL-40805-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE

commit a0145560b97881a516b14877fe64399e44793f81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Jul 2014 05:06:12 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-40805-master' of git://github.com/lameze/moodle

commit b1ab535efadb3bda9bad17aaa267baf60b4408e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Jul 2014 04:33:16 +0800
Tag:    v2.7.1

Merge branch 'MDL-46118_27' of git://github.com/dmonllao/moodle into MOODLE_27_STABLE

commit 03384ff9fda42990d8548bcad330ad5e2b999693
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Jul 2014 04:33:13 +0800
Tag:    v2.8.0-beta

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

commit 0591c2056d315f8445334ada4bed261ca1d3eafb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jun 2014 05:51:37 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle

commit 42a1546bf88ea831a3736be2a9313b4b171cc302
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jun 2014 11:00:31 +0800
Tag:    v2.6.4

Merge branch 'MDL-18162-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 7ca6b26d8f5a032f14c0e62ada50af0a5655e579
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jun 2014 11:00:26 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-18162-master' of git://github.com/andrewnicols/moodle

commit 24df080cdcde48e1e9fe321d9e684e4f0bf34703
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jun 2014 06:18:58 +0800
Tag:    v2.8.0-beta

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

commit 8c68421e3d4d368639049d6fe5aad4cdebdb93c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jun 2014 05:05:38 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45625-master' of git://github.com/andrewnicols/moodle

commit f36ccdbb405be39e5de490d8b167b395a0361a33
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jun 2014 05:02:11 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-41708-master' of git://github.com/andrewnicols/moodle

commit 02da49597c011681aa8440b000d4b0b9ba754a1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jun 2014 04:57:39 +0800
Tag:    v2.7.1

Merge branch 'MDL-33763-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE

commit b51ee5ac52e1374c61b8fb898263116f90c9181c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jun 2014 04:57:35 +0800
Tag:    v2.6.4

Merge branch 'MDL-33763-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE

commit 58e70de1935b7dcd9d64fe44150903a975b3d930
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jun 2014 04:57:31 +0800
Tag:    v2.8.0-beta

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

commit 243f766222306569be674cbf0253cccfd07d1e73
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 29 May 2014 10:28:13 +0800
Tag:    v2.7.1

Merge branch 'wip-mdl-45698-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit 18c31e25b608b5beaecb3e7a5a6b247532693ff0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 29 May 2014 10:28:07 +0800
Tag:    v2.6.4

Merge branch 'wip-mdl-45698-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit 33fdd3fd874edecf6b417dda6c57ff3e9a6129a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 29 May 2014 10:28:01 +0800
Tag:    v2.5.7

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

commit f65427b6607be376f5c0aa96e54ad76889513838
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 29 May 2014 10:27:56 +0800
Tag:    v2.8.0-beta

Merge branch 'wip-mdl-45698' of https://github.com/rajeshtaneja/moodle

commit 296029fadf18e3c8738f69e75ad373c958abdb5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 29 May 2014 04:12:43 +0800
Tag:    v2.7.1

Merge branch 'wip-mdl-45565-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

commit bc389ac7c8f80327b06e8994a3b740ae289f5ce0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 29 May 2014 04:12:37 +0800
Tag:    v2.6.4

Merge branch 'wip-mdl-45565-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit 69ab6b4713c1344ae5b87e47610429e3b39ec8c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 29 May 2014 04:12:32 +0800
Tag:    v2.8.0-beta

Merge branch 'wip-mdl-45565' of https://github.com/rajeshtaneja/moodle

commit 5abf0019f5006dd6be4b3ca7ee42faf803822c4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 09:59:14 +0800
Tag:    v2.6.4

Merge branch 'MDL-45650_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit c2182d24a490b2dfb4f6adbb3770464aae31f06d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 09:59:08 +0800
Tag:    v2.8.0-beta

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

commit 7ec197fd6435bed176cf82adf267bb1224f0112a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 09:23:06 +0800
Tag:    v2.6.4

Merge branch 'MDL-45192_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 1912b5aa9294bd449d192eaca00fc9f96ce5617e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 09:23:02 +0800
Tag:    v2.8.0-beta

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

commit 967d16dd5289303968a8b7bc77d8f0cddad68db5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 07:52:35 +0800
Tag:    v2.6.4

Merge branch 'MDL-45660_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 36c95fe075a2a2655a7b861a9ceb25caf04cc8fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 07:52:32 +0800
Tag:    v2.8.0-beta

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

commit 1ff977a5e5346e99e10c65209f1476dd978db6bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 06:55:17 +0800
Tag:    v2.7.1

Merge branch 'MDL-45686_27' of git://github.com/jmvedrine/moodle into MOODLE_27_STABLE

commit 5b4b64fc5823da238ee61efbb2bd75ae01cc97b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 06:55:14 +0800
Tag:    v2.6.4

Merge branch 'MDL-45686_26' of git://github.com/jmvedrine/moodle into MOODLE_26_STABLE

commit 837ab70b85f27c460e16d1f39aa97abcdcc2d56b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 06:55:11 +0800
Tag:    v2.8.0-beta

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

commit 362598367cf05419b419101e3801d5d1b068a074
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 06:38:22 +0800
Tag:    v2.6.4

Merge branch 'MDL-45635-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 3b31276bc8ebed7a1683e1decbadd808f0041cae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 06:36:11 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45635-master' of git://github.com/andrewnicols/moodle

commit 52292d67b029c6614fde9f3cdcab445c7e94b0a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 06:33:47 +0800
Tag:    v2.5.7

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

commit 43b611f5663d9eca31ab19f41ad068dc50d4a51e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:58:59 +0800
Tag:    v2.6.4

Merge branch 'm26_MDL-45623' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit bf010218153fc289c5320d74f10fdcebe40a2183
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:58:53 +0800
Tag:    v2.5.7

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

commit bba9c3bcf883538a38503fbaef9cf1cdc353c5fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:58:48 +0800
Tag:    v2.8.0-beta

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

commit 9832d18ab5708abfd4609007cd3fdc76b9b0d6e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:53:46 +0800
Tag:    v2.6.4

Merge branch 'MDL-45607_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit bde2e4c5997ee4af70fae67f56865dafabd5d180
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:53:41 +0800
Tag:    v2.8.0-beta

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

commit 11b5d9b763b57f1d26abeab7bfe7c3a1ad25b595
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:02:53 +0800
Tag:    v2.7.1

Merge branch 'MDL-42526-27' of git://github.com/jamiepratt/moodle into MOODLE_27_STABLE

commit 201d502a9b0623099c6c7e60096074eed4d0c9e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:02:49 +0800
Tag:    v2.6.4

Merge branch 'MDL-42526-26' of git://github.com/jamiepratt/moodle into MOODLE_26_STABLE

commit c5eef789b92dd54459920ca476b6305d35c32e64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:02:39 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-42526-master' of git://github.com/jamiepratt/moodle

commit 72cf8ec5ebd6e88cd3b25d83c660836753bc40e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 04:58:13 +0800
Tag:    v2.7.1

Merge branch 'MDL-45654-27' of https://github.com/rtcn2/moodle into MOODLE_27_STABLE

commit 1a49438ade9dd93771a8e0f87d6a09f354766075
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 04:58:08 +0800
Tag:    v2.6.4

Merge branch 'MDL-45654-26' of https://github.com/rtcn2/moodle into MOODLE_26_STABLE

commit 953eb35c84066ca2d161f23183ea807a457f05d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 04:58:03 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45654-master' of https://github.com/rtcn2/moodle

commit e77dcc602d4eec8c1fff2f256ffbeeef9e710108
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 11:45:21 +0800
Tag:    v2.6.4

Merge branch 'MDL-44323-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

commit 46921d74a6151cb468b554c99f31d410b0e68c4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 11:42:32 +0800
Tag:    v2.8.0-beta

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

commit 8711ce1f4a8ff75329a2c74828e7d1becb457a2a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 11:39:36 +0800
Tag:    v2.7.1

Merge branch 'MDL-44027-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE

commit aa1d665a3a0a195102e44f9fb6793c2b5f72d9bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 11:39:31 +0800
Tag:    v2.6.4

Merge branch 'MDL-44027-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

commit 7babd6da4502967632ddb480b168695b7940c367
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 11:39:26 +0800
Tag:    v2.5.7

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

commit dadeff80c9ecc25e039603a5b0c3a2147d450b19
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 09:59:36 +0800
Tag:    v2.7.1

Merge branch 'MDL-45603-27' of https://github.com/merrill-oakland/moodle into MOODLE_27_STABLE

commit 43f39c235f47cfd45bc6b587ea39d809453ce066
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 09:59:33 +0800
Tag:    v2.6.4

Merge branch 'MDL-45603-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE

commit c6e2fa901f3795814248c56501e9c9a9cfe5286f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 09:59:29 +0800
Tag:    v2.5.7

Merge branch 'MDL-45603-25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit 37fddc545c99d4e1496848fdf39a5dc138d62648
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 09:59:23 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45603-master' of https://github.com/merrill-oakland/moodle

commit 7be0b6989390104ebaeadb79e60e4b99b21ad7e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 09:09:34 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45479-master' of git://github.com/andrewnicols/moodle

commit 00a8c0d95601d50932762fa071fff073667e839e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 08:07:12 +0800
Tag:    v2.8.0-beta

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

commit d144e53188d94d27c31defe79ca767719bdd91ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:58:24 +0800
Tag:    v2.7.1

Merge branch 'MDL-45477-m27' of https://github.com/sammarshallou/moodle into MOODLE_27_STABLE

commit 7d14ae30e94862f4a98f4b3e1f43dc4ba1f21fae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:58:18 +0800
Tag:    v2.6.4

Merge branch 'MDL-45477-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE

commit 4dc5c77f33cd108e34883c3c1db32ba8eccfc5cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:58:12 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45477-master' of https://github.com/sammarshallou/moodle

commit 8ffb7387214968ddfc901cee79cf272baae6a1a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:55:47 +0800
Tag:    v2.6.4

Merge branch 'MDL-45535-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE

commit b3e480d34ec55e42e404f40841955ae337cd85f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:55:41 +0800
Tag:    v2.5.7

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

commit a3abb1971687e47d71ff87287816b98da7d5a60b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:55:35 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45535-master' of https://github.com/sammarshallou/moodle

commit 4fac06549aa716f26a8ef5f39de8db397fa8a070
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:43:17 +0800
Tag:    v2.7.1

Merge branch 'MDL-44953-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 58a3ed7df374ffd7cf9b6babe254adbf20e6cfa7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:43:13 +0800
Tag:    v2.8.0-beta

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

commit 7141921ad43ab105ab5f6c601842d306306f1e4e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 06:46:34 +0800
Tag:    v2.7.1

Merge branch 'MDL-45474-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit 70e78a4315babff08ec0a2ca4d88758a44608f67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 06:42:23 +0800
Tag:    v2.7.1

Merge branch 'MDL-37838-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE

commit cf1cf9499ff20b948e4ced1bdb075859e63f996a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 06:42:19 +0800
Tag:    v2.6.4

Merge branch 'MDL-37838-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

commit e44fbe93073ed3df031496a5b6b979af923e34d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 06:42:14 +0800
Tag:    v2.5.7

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

commit 08480b7a0fccbec8bdd939d5ad5e7431af1bda33
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 06:42:09 +0800
Tag:    v2.8.0-beta

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

commit 520592c43d6b8bed97743362549c3787c2a464ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:53:18 +0800
Tag:    v2.7.1

Merge branch 'MDL-45380-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE

commit d18bc9dc0273cad481ccae9cf5785c4f89b6e173
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:53:11 +0800
Tag:    v2.6.4

Merge branch 'MDL-45380-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 5c462d30cda36b1cd23ba4cf1ef9b30b5352c9fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:53:04 +0800
Tag:    v2.5.7

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

commit d57e3f8201b2fc18eeef9bce6b26f154515ad020
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:52:54 +0800
Tag:    v2.8.0-beta

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

commit 17f8fb7f3e07ac87969bd875c25bdac2688fa69a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:47:21 +0800
Tag:    v2.6.4

Merge branch 'MDL-45135-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

commit d6909258f1d73fa9a338d43b3a575c660e47eab7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:47:19 +0800
Tag:    v2.5.7

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

commit adb5d8a5d66a356976d632fdb05b80c5b951c5c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:47:16 +0800
Tag:    v2.8.0-beta

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

commit 14f40dcc9c0206d72ae8fb563f18ff59cc8fe751
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 May 2014 09:37:19 +0800
Tag:    v2.6.4

Merge branch 'MDL-45561-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE

commit 74dcc9c1bab07bf696963f4f717038e3ea7e0dbb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 May 2014 09:37:15 +0800
Tag:    v2.5.7

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

commit da4887a2d9a9c7eac0db39c448b6cf6ff8974b46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 May 2014 09:37:12 +0800
Tag:    v2.8.0-beta

Merge branch 'MDL-45561-master' of git://github.com/jethac/moodle

commit ff6a130dcdb34aaf95406555add67de0fae1ff28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 06:24:23 +0800
Tag:    v2.6.3

Merge branch 'MDL-45312_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit e0eca9b3e5f805baa09bc63c822a5c4fbeb76e13
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 06:24:20 +0800
Tag:    v2.7.0-rc1

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

commit d1b900ea920bd4e13329261daeee4f7df6adac07
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 05:10:12 +0800
Tag:    v2.6.3

Merge branch 'MDL-45221-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 8f2747e5ca07af68deb467404bc527d406abe5f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 05:10:09 +0800
Tag:    v2.5.6

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

commit 4299dc5bb6ed6c136d9ead752b143f74c54f3d2e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 05:10:05 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45221-master' of git://github.com/andrewnicols/moodle

commit d6eb354664e38767c09407efa50967f5936ba2b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 04:40:20 +0800
Tag:    v2.6.3

Merge branch 'MDL-45229-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 48dba530c6c6469547b6710ae4b7e35ade925912
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 04:40:16 +0800
Tag:    v2.7.0-rc1

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

commit 934cedc46ef5227dd25c9be7f1d21b82563708f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 10:23:33 +0800
Tag:    v2.7.0-rc1

Merge branch 'mdl45232' of https://github.com/tlevi/moodle

commit 5701d152e565816c36ef730fc771dcba56633046
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 10:09:29 +0800
Tag:    v2.6.3

Merge branch 'MDL-45164_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 6ce786cbe7c4a89a7bcdd128a1cee74517609fd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 10:09:27 +0800
Tag:    v2.7.0-rc1

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

commit 3638582c2f185920e9988cc2df78fa21dcb05309
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 10:09:21 +0800
Tag:    v2.6.3

Merge branch 'MDL-45284_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 0e7408683fff84ce6e4bb09454b719dcde31ddc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 10:09:18 +0800
Tag:    v2.7.0-rc1

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

commit 2f9955d4cce629ade11fa4d289ad57b3e481a0ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 08:22:51 +0800
Tag:    v2.6.3

Merge branch 'wip-MDL-45280-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 98778ee04f8ea303eca315e5a37e5632c9181e9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 08:22:48 +0800
Tag:    v2.5.6

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

commit 1e902feb66656018f2da100b60b54c88c4fb921f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 08:22:44 +0800
Tag:    v2.7.0-rc1

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

commit ebda3b8926e3838a5bc4fe0da74d93582d0f1f0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 08:15:41 +0800
Tag:    v2.5.6

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

commit 6b8e2f6794d3b36fb88bfca35e6ac36852818631
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 08:15:38 +0800
Tag:    v2.7.0-rc1

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

commit 5fbcc5263a8b2f81b75a57e48fccd1faf209e07f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 08:14:34 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45096-master' of git://github.com/andrewnicols/moodle

commit 5852a965cafe756f423d70c3126ec8ce7b288ae4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:37:34 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-44928-master' of git://github.com/xow/moodle

commit d4f0e345ab0855170f45659f01e385671620ff9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:33:34 +0800
Tag:    v2.7.0-rc1

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

commit ecb98f6ecdc8d730be7255fd6196b4d5cb4a6e9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:10:46 +0800
Tag:    v2.7.0-rc1

Merge branch 'w17_MDL-45214_m27_idsortlog' of https://github.com/skodak/moodle

commit 91a73fd53d9cbff6d00ba02c959e89ed3c20e10a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:05:27 +0800
Tag:    v2.7.0-rc1

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

commit 291bb582ad70714457f38ee93142c8d22200e9bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:03:22 +0800
Tag:    v2.6.3

Merge branch 'MDL-45124-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 66d76d519649fc21fc0acf4b978ba89f037e9ca5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:03:18 +0800
Tag:    v2.5.6

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

commit 8ddcb3ff8c98e9e7ca74c9f65ca17c41f1da43f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:03:15 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45124-master' of git://github.com/andrewnicols/moodle

commit 7b292552ddd63b723c6761dc49948fe7f14d3111
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:01:41 +0800
Tag:    v2.6.3

Merge branch 'MDL-45186-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit bedf257b404a164fbb52ad32732fbe473a30292b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:01:37 +0800
Tag:    v2.5.6

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

commit a544822bd8ecdecf9d812f38d37c3d235f3fe7c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:01:33 +0800
Tag:    v2.7.0-rc1

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

commit b6ac19d4d9250437267d76f70b4b30b6dab02655
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:47:27 +0800
Tag:    v2.6.3

Merge branch 'wip-MDL-45045_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE

commit 8ca374466283da39e109e98665f8dbbbec074678
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:47:06 +0800
Tag:    v2.5.6

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

commit 23a9a5632c08f909922ddf60cbc2a4e676d12bf1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:46:51 +0800
Tag:    v2.7.0-rc1

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

commit 6049011264397108b105adb83a1c297b249828c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:39:26 +0800
Tag:    v2.6.3

Merge branch 'MDL-43145-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 697496bcac176b4323eef5a2a88945e19b8a3831
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:39:17 +0800
Tag:    v2.5.6

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

commit 65ffd68179f2a4d4f10baf7421443664fb9b8e3c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:39:09 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-43145-master' of git://github.com/andrewnicols/moodle

commit 6c4fa4d535a58eb5ceaa0013e06743f015def072
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:12:18 +0800
Tag:    v2.5.6

Merge branch 'mdl45012-moodle25' of git://github.com/tlock/moodle into MOODLE_25_STABLE

commit 96ce0b22d6abbb884a4e69e9711bb04c1a3bfbd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:10:11 +0800
Tag:    v2.6.3

Merge branch 'mdl45012-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE

commit 24901691a1ddb26a238ab1bffb47422c3435faa2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:10:04 +0800
Tag:    v2.7.0-rc1

Merge branch 'mdl45012-master' of https://github.com/tlock/moodle

commit ff7061d5212d905f52245ff71305bf6c804e2e52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:59:09 +0800
Tag:    v2.6.3

Merge branch 'wip-MDL-45037-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE

commit 0a11ddf4c7af2785edb70f2397410ff584160124
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:59:05 +0800
Tag:    v2.5.6

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

commit 7ecb30d765f37821b5648dc8b331572553a1c524
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:59:01 +0800
Tag:    v2.7.0-rc1

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

commit 8a51e2d563bffd582d16e24ba8f71ee213fa8dda
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:18:28 +0800
Tag:    v2.6.3

Merge branch 'MDL-44270_26' of git://github.com/jonof/moodle into MOODLE_26_STABLE

commit c3b94d995467b41fde12888c6e3899afba69f2c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:18:24 +0800
Tag:    v2.5.6

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

commit e237b23ebf320592a8142fe7ea4c6de5ffa1eea9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:18:20 +0800
Tag:    v2.7.0-rc1

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

commit c6d1088db0e09b4bc53743123d7acd841db454b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:15:55 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45118-shibboleth-login-warning' of https://github.com/mpetrowi/moodle

commit abe2fe61809d3f8de11b0d2aa443cc270399729e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 04:57:33 +0800
Tag:    v2.6.3

Merge branch 'MDL-42761-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit fd266e48bc777a06723a41f2ca6648d8f4175ae1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 04:57:29 +0800
Tag:    v2.5.6

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

commit 4e61249dd9dd6a34b2b1c91f5e178a66f3c7a6ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 04:57:25 +0800
Tag:    v2.7.0-rc1

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

commit 56418292f14a821bd042a22734da594448f43e2a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 04:29:38 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45138-master' of https://github.com/sammarshallou/moodle

commit 1a5748b258205cbf65a97d9430e80b56ece32416
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Apr 2014 04:52:10 +0800
Tag:    v2.6.3

Merge branch 'MDL-44616_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 6f9ab8659112a2fbed29b82aef87cde1b1b33b60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Apr 2014 04:52:07 +0800
Tag:    v2.7.0-rc1

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

commit d947f5d08f0ec6f1226c783dbe94f18f004383c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Apr 2014 04:39:39 +0800
Tag:    v2.6.3

Merge branch 'wip-MDL-45116-MOODLE_26_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_26_STABLE

commit 0ed1514cc66c652acaacf107983ded0319cd3f5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Apr 2014 04:39:34 +0800
Tag:    v2.7.0-rc1

Merge branch 'wip-MDL-45116_master' of https://github.com/kwiliarty/moodle

commit 1891dba68fc6362ff521ecdfb128a5d1b5e31598
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Apr 2014 04:37:26 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45061' of git://github.com/jleyva/moodle

commit 5c3c27ac6aef0e4a606fbf1376d935ea90996e17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Apr 2014 07:43:59 +0800
Tag:    v2.6.3

Merge branch 'w16_MDL-45100_m26_coursecontext' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 0f2e18f9c8be218ecee8745dda164c36fff4cd8c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Apr 2014 07:43:54 +0800
Tag:    v2.5.6

Merge branch 'w16_MDL-45100_m25_coursecontext' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit c87a54102e4aa9ed4dde0603168a901c490caf28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Apr 2014 07:43:48 +0800
Tag:    v2.7.0-rc1

Merge branch 'w16_MDL-45100_m27_coursecontext' of https://github.com/skodak/moodle

commit 37358ac5c0eb3bbc5fc342e4ab14997e710b5d6c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Apr 2014 05:52:05 +0800
Tag:    v2.7.0-rc1

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

commit d4449f2f17518dd8d332ae2e57cc7a4c43de22a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Apr 2014 05:46:54 +0800
Tag:    v2.7.0-rc1

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

commit d668060fdc23b0f0ba02b44940b9f62974fdeb6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Apr 2014 05:23:30 +0800
Tag:    v2.7.0-rc1

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

commit 31371051659e5dc8b07753742e50757ee05ae2a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Apr 2014 12:47:47 +0800
Tag:    v2.5.6

Merge branch 'MDL-40674_M25' of https://github.com/nadavkav/moodle into MOODLE_25_STABLE

commit 19dfbe3001b3ccfcfd0028e952be52a0d6139446
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Apr 2014 12:47:38 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-40674_master' of https://github.com/nadavkav/moodle

commit 00719eefd7191e4afa185c6f82cc7e1ae8496dd0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Apr 2014 12:42:12 +0800
Tag:    v2.7.0-rc1

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

commit 564a41336775902691cf434a9a7805d98774b5c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Apr 2014 08:31:44 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-45040-master' of git://github.com/jethac/moodle

commit e8bb3c3fa6d6760d9d0852c528d56d5bbd61cec4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Apr 2014 06:26:44 +0800
Tag:    v2.7.0-rc1

Merge branch 'MDL-41891_master' of https://github.com/nadavkav/moodle

commit 92f4d00e5d80f96a5f03aabe3acce0b1a281b7fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Apr 2014 05:50:38 +0800
Tag:    v2.7.0-rc1

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

commit 8abf605ee16739dee66d07659336657dfb6bb9b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Apr 2014 05:26:07 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44760-master-2' of https://github.com/andrewnicols/moodle

commit e97b942223bec58afbe408372bef92560519b9f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Apr 2014 07:26:33 +0800
Tag:    v2.7.0-beta

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

commit 6a90bc5e05af4e9f427db3c9446f63df4a32f256
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Apr 2014 06:37:05 +0800
Tag:    v2.7.0-beta

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

commit b983a5d8692e0e0d4df20d3bb861bd2df86500c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Apr 2014 06:26:33 +0800
Tag:    v2.7.0-beta

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

commit 6ef3728805762c992ee486d47dc0dac180ea02ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Apr 2014 06:15:50 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalyst/moodle

commit da98185a58fdbef9d5db73555f7226a128c42464
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Apr 2014 06:09:02 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle

commit e2a486837fcbfd25c359b897377f2b76a3d54147
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 09:46:28 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43975-master' of https://github.com/sammarshallou/moodle

commit 17c37406b5190cd10e898c85b208428b6b3e299b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:44:21 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44408' of git://github.com/jleyva/moodle

commit 3fb4d8fa8836ba4dd5d4442eb549e5a9dd7eb112
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:42:29 +0800
Tag:    v2.7.0-beta

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

commit 2e718bc4bdbaf84a7c7dc9db8d47a9ccb2b86298
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:38:13 +0800
Tag:    v2.7.0-beta

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

commit c1229656db2427ce1c4b57bf41e35904bd935b8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:35:34 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44454_old_code' of https://github.com/andyjdavis/moodle

commit 7e9b7392cad404c15669a58fcf7bbb6f06c03827
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:31:01 +0800
Tag:    v2.6.3

Merge branch 'MDL-38183_M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE

commit 7ce77b73e2603be21acd3d483092da380db13c98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:30:58 +0800
Tag:    v2.5.6

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

commit 652f9a5ef8d9a321cefe483af366ede498760c6a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:22:23 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-36141' of https://github.com/merrill-oakland/moodle

commit 87f2c808f71c35fe06f78b48096da48d5e338fd2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 04:59:54 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44760-master' of git://github.com/andrewnicols/moodle

commit 78add102b9b921b187d04ce2bda24274a381a2fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 04:50:38 +0800
Tag:    v2.7.0-beta

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

commit 2a20285c35b3ea9614075233924ebef3fda4a012
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 12:02:56 +0800
Tag:    v2.6.3

Merge branch 'm26_MDL-44738' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 333d189d9f572ae89743f2fa4e0ea27f46c5501b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 11:43:15 +0800
Tag:    v2.6.3

Merge branch 'w15_MDL-44882_m26_upgrademaint' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 54c4398a6d880dd99fb079acc9b2880eefe4c37f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 11:43:12 +0800
Tag:    v2.7.0-beta

Merge branch 'w15_MDL-44882_m27_upgrademaint' of https://github.com/skodak/moodle

commit b017ff6da66d165bfee9751be88cf1b0d5c982b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 11:18:52 +0800
Tag:    v2.7.0-beta

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

commit 5ee0b3ceaf91f75d94af5b391cb9ecd855c8ec8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 11:02:40 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle

commit b96bee62b10425de76425bc75125c7f24a57be85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 09:16:12 +0800
Tag:    v2.7.0-beta

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

commit 2429e440116a9723d2f27c93d419631f0376640f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 04:48:50 +0800
Tag:    v2.7.0-beta

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

commit 70aab3836a78fbcd2f14bf8197142a4d4e397f32
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 04:15:34 +0800
Tag:    v2.7.0-beta

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

commit e070ffd8abc306e297906afc7aeb5bf6b4c6b456
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 11:37:19 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-32729-im' of git://github.com/andrewnicols/moodle

commit d7680b1f23ed6338e9dcd350ebedc53c21cd35d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 08:04:52 +0800
Tag:    v2.6.3

Merge branch 'w14_MDL-44824_m26_subplugins' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 6aefe4ec3c26cf68b6e49827abd22ba5962ffa88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 08:04:49 +0800
Tag:    v2.5.6

Merge branch 'w14_MDL-44824_m25_subplugins' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 3ed2a4b2ccac8aa2e168cc1199a3f13d09989794
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 08:04:46 +0800
Tag:    v2.7.0-beta

Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle

commit 067573bd0274a0d664f02e12148439032e49603f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:54:33 +0800
Tag:    v2.7.0-beta

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

commit de878a38c8c50ecf4b89a2a00f3fda1a8bd50e57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:54:13 +0800
Tag:    v2.7.0-beta

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

commit 8412561a3d3451e65fee6ecc55659e4b45e2cd0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:51:47 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44756_help' of https://github.com/andyjdavis/moodle

commit 53361c3087ac12849b9ec220171845aebc46713a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:43:25 +0800
Tag:    v2.7.0-beta

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

commit 3b07cc1c4ea326eb2f3b25b4aac019e9e58cc289
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:29:11 +0800
Tag:    v2.7.0-beta

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

commit 9b1a4cde78a795199e2d97f4ae882e6534a69246
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:28:49 +0800
Tag:    v2.7.0-beta

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

commit 0ea11b7ceee7a1f61e3d6b65af230f5cdb18039c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:27:23 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle

commit 15f780a79747965a671a5a87845cb33ac36f4db2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:27:07 +0800
Tag:    v2.6.3

Merge branch 'MDL-43284-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE

commit db1e66c1e067619e9c1cf05a85d67c89c232d88e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:27:05 +0800
Tag:    v2.5.6

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

commit b9c16d401a25c00fc7c67965596eb4c6bb421aad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:27:03 +0800
Tag:    v2.7.0-beta

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

commit 4b92f2b79b85292148bc2d51d1daf08f70f64f9d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Apr 2014 16:20:05 +0800
Tag:    v2.7.0-beta

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

commit e1190da615032426818a0d77ac60fd70a2f5a7f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Mar 2014 11:35:47 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skodak/moodle

commit 46c627cf056f76f652a831955b1dd5af5ca0ff02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Mar 2014 08:25:51 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44690-master' of git://github.com/jamiepratt/moodle

commit bfb6e97eaeb590ed3ad211742486123963e30e25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Mar 2014 06:33:15 +0800
Tag:    v2.7.0-beta

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

commit dcb43ad7ff73afc032621262dd8e74fcba3031b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Mar 2014 06:18:07 +0800
Tag:    v2.7.0-beta

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

commit f94bde7250025b16b08bf6c5ffce1d234864ebd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 11:23:10 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44368_m27_actfilter' of https://github.com/skodak/moodle

commit 11862768ceae3e141a01ca805bd67528a692cfc3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 11:11:10 +0800
Tag:    v2.7.0-beta

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

commit 027d10d67f829a53105a2a906eb66971c9ac6124
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 10:06:44 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44075-master-v3' of git://github.com/jamiepratt/moodle

commit 8134eb8573cd0428e8f6e2ef6643dbb1bf613151
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 07:51:14 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44535-master-v2' of https://github.com/jamiepratt/moodle

commit 50fea8055f99e08e8fcd1faaa559f4ba6a39564f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 07:30:47 +0800
Tag:    v2.6.3

Merge branch 'MDL-43960-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 5e0e6a8c44a86891d562e2d76cc21ebd6b1c2d03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 07:30:43 +0800
Tag:    v2.5.6

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

commit a4687507236cb04469533c9a283dc6fb171c4974
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 07:26:53 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44511_m27_jquery' of https://github.com/skodak/moodle

commit fe242260639a9c48c22c7df9c38ec322e0e57269
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 03:56:49 +0800
Tag:    v2.7.0-beta

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

commit e23dcd5b94361dc1d3c1f3c96b7a33af560eab0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Mar 2014 05:26:20 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43839_clean_default3' of https://github.com/andyjdavis/moodle

commit 84e8be12e5a9aa653672043ee2baff4a01e3b137
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Mar 2014 10:44:08 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-44552' of https://github.com/rajeshtaneja/moodle

commit 89381287cecdbe1d0b85e7b240e883683d2956ee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Mar 2014 10:04:26 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44608-master-fix1' of http://github.com/damyon/moodle

commit 03ba50f556cda823456876245eb3f81a26193911
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 12:05:05 +0800
Tag:    v2.6.3

Merge branch 'wip-MDL-44542-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit ee986da3ed17d714ed75dd176125c7df60f85fe0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 12:05:01 +0800
Tag:    v2.5.6

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

commit f3516ad3b8d83343cd563216f515bfc962a639ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 12:04:57 +0800
Tag:    v2.7.0-beta

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

commit c98edede859e59a4719bd25ffe2c5a241fdbc9bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 10:00:24 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44505' of https://github.com/bostelm/moodle

commit 7b78b302127042a96153c8f3874ac628456ce67d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:41:07 +0800
Tag:    v2.6.3

Merge branch 'MDL-44502-26' of https://github.com/bostelm/moodle into MOODLE_26_STABLE

commit 29591a867f7977fbc40a567d7027d1d7a8f9376b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:41:02 +0800
Tag:    v2.5.6

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

commit 319633a0c6821b7f9e4bbdc38c46ba116b8d8c77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:40:56 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44502' of https://github.com/bostelm/moodle

commit 8b0892d605191876d2fc82ccfd71ca0192968e7f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:36:04 +0800
Tag:    v2.6.3

Merge branch 'MDL-44433-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

commit 5cf880d88392deeddaecac4bba9b1a21fe78a6c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:35:59 +0800
Tag:    v2.5.6

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

commit 72d80b598d1ee1b0162d23b75529b0245e000bd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:35:55 +0800
Tag:    v2.7.0-beta

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

commit dbedde8d8651c70175d7c5fa84ea5f913b8e3cb2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:32:37 +0800
Tag:    v2.7.0-beta

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

commit a2db21c633a334ba39207e7ad549e77cc233686d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:27:08 +0800
Tag:    v2.6.3

Merge branch 'mdl44499-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE

commit 069b3ae29c01c6d4c8a9a50dfb1ca09d312bb183
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:27:02 +0800
Tag:    v2.5.6

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

commit b02d88d98cdc8f47c21cd2f4140109bf09d142e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:26:56 +0800
Tag:    v2.7.0-beta

Merge branch 'mdl44499-master' of https://github.com/tlock/moodle

commit 224f8dfda100c72f7ad2b278a0851c601c49b706
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 07:52:19 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44527_m27_cacert' of https://github.com/skodak/moodle

commit 43301757eb09f3b7b21b5b69a18d85d5318d77ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 06:48:47 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44515_m27_phpexcel' of https://github.com/skodak/moodle

commit 80440a4a66e44430bb69cc3a4a883104fbca84d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 06:48:34 +0800
Tag:    v2.6.3

Merge branch 'w12_MDL-44516_m26_purifier' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit faa87eb28c4d84eb68d4405d71959d2624ad9049
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 06:48:28 +0800
Tag:    v2.5.6

Merge branch 'w12_MDL-44516_m25_purifier' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 0406fb9a4bb1ce83410a778949af876fd17aead6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 06:48:21 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44516_m27_purifier' of https://github.com/skodak/moodle

commit 1c6dff6f1c32e116aa683e32668e49e06c52402c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 06:48:11 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44521_m27_tcpdf' of https://github.com/skodak/moodle

commit 7286f5923d1b6f3ee749f07c7ef3417c2c8f9a7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 05:17:04 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44522_m27_markdown' of https://github.com/skodak/moodle

commit 114d1ccf32c02ae7f9dae82274d1a8bd3a0005d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:43:42 +0800
Tag:    v2.7.0-beta

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

commit c16fc1946124b547225587690ba2a7e17af89018
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:30:39 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44599_m27_siteid' of https://github.com/skodak/moodle

commit c961d9626e0a5989f3d515de78fb3079f4c95e31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:16:09 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44609_m27_taskcomponent' of https://github.com/skodak/moodle

commit 683b5caa061d7660b559efc7ef45e76977db5b28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:03:31 +0800
Tag:    v2.6.3

Merge branch 'MDL-44585-moodle26' of https://github.com/StudiUM/moodle into MOODLE_26_STABLE

commit 7ad84b0c462d1236ff4fce293f79a4b13f80a58c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:03:26 +0800
Tag:    v2.5.6

Merge branch 'MDL-44585-moodle25' of https://github.com/StudiUM/moodle into MOODLE_25_STABLE

commit 7aafc49c1871f1b4e2e2baa4dacf9de6078a0e42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:03:21 +0800
Tag:    v2.7.0-beta

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

commit 9ea57c8bc3b8a286862571adc4678fb45496177d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Mar 2014 07:37:02 +0800
Tag:    v2.7.0-beta

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

commit a8db93c5ace3e6ff8df71b3d850d50b8f09e2154
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Mar 2014 07:10:48 +0800
Tag:    v2.7.0-beta

Merge branch 'w11_MDL-44299_m27_sessiongc' of https://github.com/skodak/moodle

commit 390188606e74170ac19b1e45857abaff4f820684
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 09:13:14 +0800
Tag:    v2.6.3

Merge branch 'm26_MDL-37733' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 1dc93170ae3972cd712cc10cd148ed3f9e0d6118
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 09:13:12 +0800
Tag:    v2.5.6

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

commit 63afbaa6be6ace92439a743f24a09d22947c9019
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 09:13:10 +0800
Tag:    v2.7.0-beta

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

commit b679a1760aba70136d7270b5cec869fa8ecf9ac7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 07:31:18 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-40699-UI-language-changes-when-logging-out-of-Moodle' of git://github.com/michael-milette/moodle

commit 559834f786b594c664841e9235103d8c60a2cc65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:57:01 +0800
Tag:    v2.6.3

Merge branch 'MDL-42368-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

commit f3e25119ad172c0d5d8e3cfa316bc5b614cd22c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:56:55 +0800
Tag:    v2.5.6

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

commit f3deabee48e6c852833edc28476118433ff2dc30
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:56:51 +0800
Tag:    v2.7.0-beta

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

commit ce05c004536dd1b02ac700f52cbd393b631e0d85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:21:59 +0800
Tag:    v2.6.3

Merge branch 'MDL-44345-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit c6f0baa3873313bdfbd4bd8b0a4aec2f20c5ee83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:21:54 +0800
Tag:    v2.5.6

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

commit 5f2fcc388b568032d0a4ac07142f36bdd34d44cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:21:48 +0800
Tag:    v2.7.0-beta

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

commit ee4655eec1408295215bea10b5e9c0b988129a49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:19:02 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41173' of https://github.com/danielneis/moodle

commit 509f37138912485520fc8df8887d6989ceb5f0a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:22:41 +0800
Tag:    v2.6.3

Merge branch 'wip-MDL-40721-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit eb5d6cc5745b35e4d5588bbbe6cad7e05c6c21af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:22:37 +0800
Tag:    v2.5.6

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

commit 1aefc90960908a97569cba5c5e73b26b3e99b72f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:22:33 +0800
Tag:    v2.7.0-beta

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

commit 4294de1edfa8a004ceb1db3fa6d0de59d04b3922
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:18:14 +0800
Tag:    v2.6.3

Merge branch 'w11_MDL-44451_m26_addonloc' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit d59a7f97dd009d35049abd7ceee58da68c7bfc05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:18:11 +0800
Tag:    v2.5.6

Merge branch 'w11_MDL-44451_m25_addonloc' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 8daf8cbc0a7bf9f00721a6163caf24675d585e6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:18:08 +0800
Tag:    v2.7.0-beta

Merge branch 'w11_MDL-44451_m27_addonloc' of https://github.com/skodak/moodle

commit 509edd5624c4d049dd57f1f036fba6e24d46724d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 06:54:05 +0800
Tag:    v2.7.0-beta

Merge branch 'w11_MDL-44496_m27_eventbuffer' of https://github.com/skodak/moodle

commit 5caac6a49433369fae4f58b3fbd684cf4d4a692d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 05:10:28 +0800
Tag:    v2.6.3

Merge branch 'MDL-44334-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 421786ed61c1aa57d5f5bb2383e82adedc6a548e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 05:10:08 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44334-master' of git://github.com/andrewnicols/moodle

commit 2710ad2b520e7543fd2592ae84335240760e09d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 04:19:44 +0800
Tag:    v2.7.0-beta

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

commit 6b347521e31496b744feb5533ec4679991fc2701
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 03:54:39 +0800
Tag:    v2.6.3

Merge branch 'MDL-43721-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit e75faa20f64df69723410e0b15c1f8cb0247b513
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 03:54:32 +0800
Tag:    v2.5.6

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

commit 1fef3f6aaca1a738006ebb44b08465c2db04cb89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 03:51:36 +0800
Tag:    v2.7.0-beta

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

commit 2f5288dea029bfd440cb7e747707aae28c9d3a69
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 03:46:11 +0800
Tag:    v2.6.3

Merge branch 'wip-MDL-44471-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit c10affa57b218065d29476c2f65d76ba4250c8ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Feb 2014 04:31:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43997-master' of git://github.com/andrewnicols/moodle

commit 38226a3f4a8c9b789c9752ee1e447d94d2c2eb3c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Feb 2014 04:30:50 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44161-master' of git://github.com/andrewnicols/moodle

commit bfb99b7e1d3a657b93d8ee001c3e366ce20325b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:16:39 +0800
Tag:    v2.6.2

Merge branch 'MDL-44037_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 9ef6537e4cc52d9fdccc716c12f4516caf54641e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:16:36 +0800
Tag:    v2.5.5

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

commit afbd791a055fd9fe0010751e0e541e68b7abd5b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:16:33 +0800
Tag:    v2.7.0-beta

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

commit 90e7406e296591c2637b4c3ef074779c8eb4c860
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:15:41 +0800
Tag:    v2.6.2

Merge branch 'MDL-42404_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 0c51cfefb7e001b3e4d8b62c9534cafcb29c156a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:15:39 +0800
Tag:    v2.5.5

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

commit 487f74813e49f334abbe5faaaade05506976d355
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:15:36 +0800
Tag:    v2.7.0-beta

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

commit 2f31445ff899c0e4fdc50c7babf490b0acfb64e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:16:41 +0800
Tag:    v2.6.2

Merge branch 'MDL-44142-26' of git://github.com/mrverrall/moodle into MOODLE_26_STABLE

commit 077aa1b431cdf7478bd52165d3ee35eba94be811
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:16:36 +0800
Tag:    v2.5.5

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

commit 1fa13df59ea0a21e8b448d2b360245a154f4759f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:16:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44142-master' of git://github.com/mrverrall/moodle

commit 0b420fab17384e98ef05fb817be1fae53ae411ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:07:02 +0800
Tag:    v2.6.2

Merge branch 'MDL-44042-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit fa52e6494d3ad06a24f0db91e1ef1513a5ea034b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:06:58 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44042-master' of git://github.com/andrewnicols/moodle

commit a413d15875271873a39769fde84732753f13fc86
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:04:51 +0800
Tag:    v2.6.2

Merge branch 'MDL-44055-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 9e7fb3e848015725aa9e294f6c6ac746e77d0f85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:04:48 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44055-master' of git://github.com/andrewnicols/moodle

commit ba0f2d978be295587280f4330cc1a740244ac6c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:49:12 +0800
Tag:    v2.6.2

Merge branch 'MDL-44079-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit a2b2fa9b3fc8bf9aa84733e9e452a3a4d8b8e054
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:48:52 +0800
Tag:    v2.5.5

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

commit 87643ff599f0f16e92d61c59b6d335b3dc0718d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:48:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44079-master' of git://github.com/andrewnicols/moodle

commit 3c60db1a842cb8d3623a6f90b0d00a6b1bdbb453
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:28:06 +0800
Tag:    v2.6.2

Merge branch 'MDL-43979-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 80ce7e1a8dbc5c559004453ed398cdd02db58bca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:27:48 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43979-master' of git://github.com/andrewnicols/moodle

commit 96dabdf68dc8b7c671203c57d245e59ce6232197
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Feb 2014 03:25:47 +0800
Tag:    v2.5.5

Merge branch 'int25_MDL-43200' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit a70818530e091e068b4e569e43e1afc7c2e612da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Feb 2014 03:25:32 +0800
Tag:    v2.6.2

Merge branch 'int26_MDL-43200' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 7a27c83bc0fe03b4f41ab9666e271d2a15bc6812
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Feb 2014 04:24:11 +0800
Tag:    v2.6.2

Merge branch 'MDL-41644_26' of git://github.com/apsdehal/moodle into MOODLE_26_STABLE

commit be1ae343eaaeba8cb6d52a49f590d6b01e6ec5f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Feb 2014 04:24:08 +0800
Tag:    v2.5.5

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

commit e52bbf07a8124ba708b39422a863734ee394095c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Feb 2014 04:24:06 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41644' of git://github.com/apsdehal/moodle

commit ae7befec1e5953aba96b26ef80a86cd51ec1f872
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Feb 2014 04:21:54 +0800
Tag:    v2.7.0-beta

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

commit 58ce5122b226e36a5a68e4f7ecc83e6bf269f8bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 09:10:58 +0800
Tag:    v2.6.2

Merge branch 'MDL-43941-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit e91a87511bb0b021cede298a64c7f7241f9ad192
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 09:10:55 +0800
Tag:    v2.5.5

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

commit b73fd8608a000679754318fa4908ee1a896be9df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 09:10:52 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43941-master' of git://github.com/andrewnicols/moodle

commit 696195afee433eb2e62a190090f5ad260b02e590
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 04:32:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43994-im' of git://github.com/andrewnicols/moodle

commit ec5dc1fab75f1d14bb7fbc766eed636d1b00f3c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 03:27:44 +0800
Tag:    v2.6.2

Merge branch 'MDL-43929_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 04324e81e2734419e5f9f585c8565df14b9f5b02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 03:27:40 +0800
Tag:    v2.5.5

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

commit 39a0509b68caf5ecf4cc67c13d5bf9e4b6a8c4cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 03:27:35 +0800
Tag:    v2.7.0-beta

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

commit 72d953e19eafe4382f44e66fa53bf9b62b0de238
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:58:36 +0800
Tag:    v2.7.0-beta

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

commit 5eb9a4f631f352400e8bf21764b173c80dabf552
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:26:24 +0800
Tag:    v2.6.2

Merge branch 'wip_26_mdl-32724' of https://github.com/iarenaza/moodle into MOODLE_26_STABLE

commit f7dea8ae75df256aa5ff501086ca9cf1b1c39057
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:26:18 +0800
Tag:    v2.5.5

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

commit c9f5f0afd37fc3c486df700dfa04996da83348ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:26:05 +0800
Tag:    v2.7.0-beta

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

commit 0527e023906fcf802c1589126efc1ac6a7d999c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:21:41 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43774_master' of https://github.com/totara/openbadges

commit e2b27417dc30967a5fc26645efb30f1e122cca41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:20:25 +0800
Tag:    v2.6.2

Merge branch 'MDL-43774_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit 36803e0f78a4f750a722c8e0b63034f4d5bc048c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:20:20 +0800
Tag:    v2.5.5

Merge branch 'MDL-43774_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 8ebaf4bd7401b2af6530ef6a57cd7429a6d89307
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:53:55 +0800
Tag:    v2.6.2

Merge branch 'MDL-43267-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 52b7e8aa58d9a794c64a3c8aa2dddf3e773bf5b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:53:51 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43267-master-3' of git://github.com/andrewnicols/moodle

commit 7aaf82deb64b5ff479a857b9d5d00a1893923d0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:16:22 +0800
Tag:    v2.6.2

Merge branch 'MDL-40938-26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE

commit d42f989c8150592268dbd032729aea2b13677abe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:16:17 +0800
Tag:    v2.5.5

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

commit 1c8c3a6db19714612ecf20559997fed9b1f1a283
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:16:12 +0800
Tag:    v2.7.0-beta

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

commit 83fffcb97a3c666dbbcbc2e229b9fdd16b026afd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:11:36 +0800
Tag:    v2.6.2

Merge branch 'MDL-43200_26' of git://github.com/apsdehal/moodle into MOODLE_26_STABLE

commit 1cb3c0facc54156b2de18c65c3e7200db480e7d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:11:25 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43200' of git://github.com/apsdehal/moodle

commit a5a7dd624f77eb36ecff72fe3a9f92f77f691164
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 08:13:03 +0800
Tag:    v2.6.2

Merge branch 'MDL-42882-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

commit d97c8c30ea306ff86ea3c728a4925f58b426a0aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 08:13:00 +0800
Tag:    v2.5.5

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

commit 5e45f31d831195908701327dcc21f197e38f970e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 08:12:57 +0800
Tag:    v2.7.0-beta

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

commit 4acc62f2c41186d93ee3e757bc09384d5ced68bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:50:34 +0800
Tag:    v2.6.2

Merge branch 'MDL-43641-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit e9eb744f6df8363ff02d283ae19471c8c7120f39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:32:13 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle

commit e32b3de09eb21ae2c4433ca26eaa074d702780f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:30:20 +0800
Tag:    v2.6.2

Merge branch 'MDL-44056_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 074b8b2989576de199ff2feced0ce4b89b6530a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:30:16 +0800
Tag:    v2.5.5

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

commit f0c4d4d22eb5c7d21f9474c7d6a03368fe19c1d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:30:12 +0800
Tag:    v2.7.0-beta

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

commit 7082e945b226ea1d17c716b5644764838bca68f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:27:12 +0800
Tag:    v2.6.2

Merge branch 'MDL-43838_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 3c1bba2b114d020600330868808b10063d00f614
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:27:07 +0800
Tag:    v2.5.5

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

commit cda0ebf042b1c93418c14c523c3f30049d29f73b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:27:00 +0800
Tag:    v2.7.0-beta

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

commit ab4ec7a21c586c84f3afc41bf1ba5ad290fc5574
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:48:22 +0800
Tag:    v2.6.2

Merge branch 'MDL-43969-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit f10418699d21a2b5fc97959559590f96177343fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:48:19 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43969-master' of git://github.com/andrewnicols/moodle

commit 4e4fabd197b5e351810a3a85db20642ddd9528f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:40:21 +0800
Tag:    v2.6.2

Merge branch 'MDL-43992-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit a29f1f962990b9b3e8f6525989dd4d4f5fbdfa94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:40:17 +0800
Tag:    v2.5.5

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

commit db00b9c8824b67585fc9f7066a17ae058a4f667a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:40:13 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43992-master' of git://github.com/andrewnicols/moodle

commit 8ef741eeca663b23fd89ef12b842fd9166fe4ed3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:31:04 +0800
Tag:    v2.6.2

Merge branch 'MDL-44020-STABLE-26' of git://github.com/jleyva/moodle into MOODLE_26_STABLE

commit 579319888cbff51abbc62a9538dc099c298a89c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:31:01 +0800
Tag:    v2.5.5

Merge branch 'MDL-44020-STABLE-25' of git://github.com/jleyva/moodle into MOODLE_25_STABLE

commit 872b051fa38a0f512c793317f895253bd0746462
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:30:57 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44020-MASTER' of git://github.com/jleyva/moodle

commit 764d330c3efc75594ed7bb94d669941a8dffebb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:28:19 +0800
Tag:    v2.6.2

Merge branch 'MDL-44046_m26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE

commit 1ffb89f9b8b81da7f5b61a0ba1e3aad373b7ca44
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:28:14 +0800
Tag:    v2.5.5

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

commit 52aa25fd416df6414d1549f8db3a2f906e5e2c7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:28:08 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44046' of https://github.com/merrill-oakland/moodle

commit a95a35632279fb84898e3a78b9156a6ba8caaefb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:24:01 +0800
Tag:    v2.6.2

Merge branch 'MDL-43978_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit 5afb7fd120445877d658a2c4b864a6efcf3d5397
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:23:56 +0800
Tag:    v2.5.5

Merge branch 'MDL-43978_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit fbf1f6fdeaa85b3ce2497f447b1435135e0d4b43
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:23:51 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43978_master' of https://github.com/totara/openbadges

commit dfc8d1d7f5e5a1b225bf63b4130cd7e50b9ae6c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:06:40 +0800
Tag:    v2.6.2

Merge branch 'MDL-43994-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 966bb0f45a94724fa38a1882b2a07526d291a868
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:06:35 +0800
Tag:    v2.5.5

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

commit 642ad27297ff6f9e422193782a696d1e1075e9f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:06:31 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43994-master' of git://github.com/andrewnicols/moodle

commit 179ddd105ba83cbbfa51c641c7eeef1b367cc549
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:50:23 +0800
Tag:    v2.7.0-beta

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

commit fdf33244b503504f8284be622593ae775c8dc7ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:44:56 +0800
Tag:    v2.6.2

Merge branch 'MDL-44029-quiz-group-delete-handler-bug_26_STABLE' of https://github.com/mpetrowi/moodle into MOODLE_26_STABLE

commit 202e947ffc2fc2db1ae8dd7e4e9b30750a6542cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:44:50 +0800
Tag:    v2.5.5

Merge branch 'MDL-44029-quiz-group-delete-handler-bug_25_STABLE' of https://github.com/mpetrowi/moodle into MOODLE_25_STABLE

commit 705c5e0aeda4d5ceff20561d135904ad8d71d826
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:44:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44029-quiz-group-delete-handler-bug' of https://github.com/mpetrowi/moodle

commit 3b6aa4f70cee3738e47be205a21e1feca1c8661d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:43:05 +0800
Tag:    v2.6.2

Merge branch 'MDL-43946_m26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE

commit 1397e103ba4d04b10628eb6e2b54745ff9bff9a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:42:59 +0800
Tag:    v2.5.5

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

commit 065bc30c8d534111f77789fb7fffdab17bd18453
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:42:55 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43946' of https://github.com/merrill-oakland/moodle

commit b1733dc795ba597781d53226e7bf41eb259e9d90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 07 Feb 2014 06:45:55 +0800
Tag:    v2.7.0-beta

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

commit 155771cb4bcca6235e465733a4ce5ac54268aa06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 06 Feb 2014 05:04:06 +0800
Tag:    v2.6.2

Merge branch 'MDL-43936_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 37a079acb57a379b1a2b22e9e57576d984f5d22f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 06 Feb 2014 05:04:04 +0800
Tag:    v2.7.0-beta

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

commit d9fece93d009ddc1c0130df6c2c79407b52b24be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 05 Feb 2014 07:36:52 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41757-master' of https://github.com/jamiepratt/moodle

commit 8213574043505acc276150ff9be13c415a2c75c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 05 Feb 2014 07:35:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle

commit 3ec0946e100665c9bad0d7bfd8bef095d3f43c69
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 05 Feb 2014 06:44:49 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43027-master' of git://github.com/jamiepratt/moodle

commit 13de6099c1fad20743d71c4219bbed2231c6cb05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 05 Feb 2014 06:29:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43952-master' of git://github.com/andrewnicols/moodle

commit aa01949f24d2cdea8785dd026a93d17294469401
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 10:50:48 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle

commit 82bef99867baba932526073c2ac250dea2d5ad63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 10:24:02 +0800
Tag:    v2.6.2

Merge branch 'MDL-43369-26' of git://github.com/jamiepratt/moodle into MOODLE_26_STABLE

commit ab34537ca49cf25fb790c79bb4a85e0501e5ce75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 10:23:57 +0800
Tag:    v2.5.5

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

commit 5c876ed21f174fe6c9206e56c4e0b525a0828e80
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 09:17:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43538-master' of git://github.com/andrewnicols/moodle

commit 2f166b3284d898e586cfebdf01ea71cef1ce8799
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 07:41:00 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43885-master' of git://github.com/andrewnicols/moodle

commit 93289de65eaf602c1bb4217ca1870248f2b05be0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 07:38:28 +0800
Tag:    v2.6.2

Merge branch 'MDL-43885-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 06ce535d9c1dd6df888a128393ae8e08da6fc70e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 07:38:25 +0800
Tag:    v2.5.5

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

commit 68ad9d82bf5040aa3dfd04623bb49f93738b6d40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 06:14:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43886-master' of git://github.com/andrewnicols/moodle

commit 5dce0f2a1aaefca6ff68f15637591af9eab694bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:57:37 +0800
Tag:    v2.6.2

Merge branch 'MDL-43892_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 8aaf8591f1e834f50ac9229bddbac1bb351ea398
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:57:32 +0800
Tag:    v2.5.5

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

commit 1331241bf4eb3e2c738742982a4206354ed73865
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:57:26 +0800
Tag:    v2.7.0-beta

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

commit 90c15466d8467c7309cc609b554539c7d7366c42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:47:09 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-33920-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 23ca363633cd37471011ae246d4e45479f26323e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:47:04 +0800
Tag:    v2.5.5

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

commit 527dd78d369b629e9956c5b7213ad31d611a6ce0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:47:00 +0800
Tag:    v2.7.0-beta

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

commit 5666a74c91c8889fd65c4a2ca16b6720247cc75c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:23:24 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43893-master' of git://github.com/andrewnicols/moodle

commit 5eb041021e51ba67649cc0e0f2a9ad18de4a84a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:22:42 +0800
Tag:    v2.7.0-beta

Merge branch 'w04_MDL-43903_m27_mssqltests' of https://github.com/skodak/moodle

commit c78f073a411ca1018585dd828ef334e7cb24413a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:11:47 +0800
Tag:    v2.6.2

Merge branch 'MDL-43936_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 4a30b40069598a3b5e3c49b78c1a7aab3628aacc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:11:44 +0800
Tag:    v2.7.0-beta

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

commit 7c8c6aa76b7adf98a1fa043d6486f7729edbdf69
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 04:53:16 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-40911' of https://github.com/rajeshtaneja/moodle

commit 2ad02f9c91a62947026968d31b9f7f45bd526a48
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 04:11:41 +0800
Tag:    v2.6.2

Merge branch 'MDL-43884-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE

commit 881b8443ce42c59e364d7e53fa2ad747eda8d665
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 04:11:36 +0800
Tag:    v2.5.5

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

commit b2ca12e9041cdad9c24a23f292a28e6402a4ba31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 04:11:27 +0800
Tag:    v2.7.0-beta

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

commit 6bdf77c1913cf1b10cee7cbb05f7e75108e40b62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 03:41:37 +0800
Tag:    v2.7.0-beta

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

commit fa0b936d59628a34927ddb3dd856cbd05d825b00
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 03:29:17 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-39942-MOODLE_26_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_26_STABLE

commit 5461c61f02250da49973b91e8103c674ab2ee5c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 03:29:09 +0800
Tag:    v2.5.5

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

commit 6958c718cc9ba90172d366d68f591cd9b6c799ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 03:28:56 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle

commit 453d66b782f01549fc0454678a6365eb7f09fce3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 29 Jan 2014 08:21:00 +0800
Tag:    v2.7.0-beta

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

commit 07481c927748ea56e8b3da91c3a7be44f76a23af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 29 Jan 2014 03:23:51 +0800
Tag:    v2.7.0-beta

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

commit 9681639337c3cd9aaeacacffa9f0d744f40f3967
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 07:16:26 +0800
Tag:    v2.6.2

Merge branch 'MDL-43246_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 9b14c62e98c556362665283c6ff971e4996b4389
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 07:16:23 +0800
Tag:    v2.5.5

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

commit 9123721e4f005a0a7a9ed5a58e5e25d78343554e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 07:16:20 +0800
Tag:    v2.7.0-beta

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

commit 83bfad45a54349509698ea2df67de39820bfa432
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 03:40:48 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-43643-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit c77d28e5b25b77b290f2c3fda0a029255c7dcf76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 03:40:45 +0800
Tag:    v2.7.0-beta

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

commit 049422651c87f93e5fde78f415ef40a17186893e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 10:28:47 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-33839c' of git://github.com/mkassaei/moodle

commit 068ffec81b77375be9668d09a17f4a67a1396219
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 09:30:57 +0800
Tag:    v2.7.0-beta

Merge branch 'w04_MDL-43761_m27_sqlinstall' of https://github.com/skodak/moodle

commit 250611b579f46769324ff8c9af9f045d2e255d4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:32:25 +0800
Tag:    v2.6.2

Merge branch 'w04_MDL-43746_m26_courselogin' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 6536f04a5e5fdf28c0897d7ef74c74f68b592c4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:32:20 +0800
Tag:    v2.5.5

Merge branch 'w04_MDL-43746_m25_courselogin' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 9299144461c1dd79836acac11748bb1fe97dfed3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:32:08 +0800
Tag:    v2.7.0-beta

Merge branch 'w04_MDL-43746_m27_courselogin' of https://github.com/skodak/moodle

commit 5ccfa402920f5a9c95d32f943c6dd8ccf216f5fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:16:15 +0800
Tag:    v2.6.2

Merge branch 'MDL-43794_m26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE

commit 00dfc95708f599090263319511858e7ddbedb428
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:16:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43794' of https://github.com/merrill-oakland/moodle

commit 7c445ab8c0bb0e95e5c35193bcba2a0e1c0a4114
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 09:46:31 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43527_m27_safemode' of https://github.com/skodak/moodle

commit 8e06909afdb87e728130342013f2b7851b665a75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 09:19:11 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle

commit 98f0074fc59d40904016f8c794979a12fe51a201
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 09:16:26 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-31050_rss' of https://github.com/andyjdavis/moodle

commit e4ac256c35394d46d530cf14288680cb76f26bc5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 08:09:42 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-18770' of https://github.com/rajeshtaneja/moodle

commit e6d3f9438e1ef6c4483698665d25923ee66c7369
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 07:01:54 +0800
Tag:    v2.7.0-beta

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

commit 61a79e01fca1bc2ab446d6d84518e1a5ffead919
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 07:00:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-40551_master' of https://github.com/totara/openbadges

commit a9bd004c8cb0af366942e6f784b247d5769a51b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:28:34 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle

commit 0cb1903bfd7027e5ce5b62a95aa8c2baf54bcb0a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:28:25 +0800
Tag:    v2.6.1

Merge branch 'MDL-35973_redirect_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit ba5255f4f17fcc759070add6aaa1bcc94e6399a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:28:10 +0800
Tag:    v2.5.4

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

commit 9b94e327d301da05222b037f851a749ea91236bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:22:29 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43281-master' of git://github.com/andrewnicols/moodle

commit 8571b889f37c13a77cdc4cbd68797c2cc18012ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:22:09 +0800
Tag:    v2.6.1

Merge branch 'MDL-43281-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 8a89a476e7a08d6bc3d4cb512aa9928951e0945f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:21:42 +0800
Tag:    v2.5.4

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

commit bf78d33216903b56cea52f78c4f2f7319249f5c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:17:58 +0800
Tag:    v2.5.4

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

commit b8ac884f9dafe889cad227eac2c0fdb6ea3181ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:17:47 +0800
Tag:    v2.4.8

Merge branch 'MDL-37962_beep_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit 4c852874d197ac273d6c539cad656d2491793281
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:13:55 +0800
Tag:    v2.5.4

Merge branch 'MDL-43530-25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit f29dcf642b614ea2cdaa815e8ab3ada31f72eed0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:30:31 +0800
Tag:    v2.7.0-beta

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

commit ec9f2a7d3f10bd9582d860ff13fcc871199443a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:30:13 +0800
Tag:    v2.6.1

Merge branch 'MDL-42212-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 871b85e8cf2aed64837fbb1c3f529eec3eec872c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:30:02 +0800
Tag:    v2.5.4

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

commit 6e2745d23865d41e654741df0f735e4ee990fd9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:29:55 +0800
Tag:    v2.4.8

Merge branch 'MDL-42212-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 97e9098927830a68b75aa3964f1b242c5c09d2c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:20:39 +0800
Tag:    v2.6.1

Merge branch 'MDL-42801-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 62b4ddc29473bf1d47a928deb28fb3448f343acf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:19:20 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42801-master' of git://github.com/andrewnicols/moodle

commit dfed81ae127707bafd9591055bcea4056822e885
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 04:53:15 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-36334-master' of git://github.com/andrewnicols/moodle

commit 7404bfd003972da127a104418f6fe9195539a251
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 04:11:32 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43196_m27_signupfiles' of https://github.com/skodak/moodle

commit 910dc3393cf3cd05c98182bb9a5aa0c0d66d977d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 12:17:46 +0800
Tag:    v2.6.1

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit 9caa330e56d68e15d884a3416197844e743f00ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 12:17:40 +0800
Tag:    v2.5.4

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

commit 52c4f06af320768f0df30838a8db2f8965360321
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 12:17:34 +0800
Tag:    v2.4.8

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit a89ce4309164c2b703298d91c44b215663c277e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 12:17:26 +0800
Tag:    v2.7.0-beta

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

commit 69f86e87a7e897f2ae5e67f850a5e978b61dd15e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 07:52:22 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-41788_master_3' of git://github.com/gjb2048/moodle

commit 5ac473e356d45d64053edc4c7853d606b7227216
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 07:52:02 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-41788_M26_3' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE

commit 986e4f6720f85287b53c7a2767358498e51883a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 07:51:50 +0800
Tag:    v2.5.4

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

commit 946e770ede05a7c26faf3c4e9d5a3c9705350b40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:56:01 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43243-master' of git://github.com/andrewnicols/moodle

commit 24bf5af4b7efe20bc68d79bb8d86df45dcd2989a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:41:48 +0800
Tag:    v2.7.0-beta

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

commit 10beedc18fac2e58f90b5786d37eb3bf94fc5160
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:41:32 +0800
Tag:    v2.6.1

Merge branch 'MDL-41246-moodle26' of git://github.com/StudiUM/moodle into MOODLE_26_STABLE

commit 5d10a4c6908b71709a865e62ea98c4db28e23a6a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:41:23 +0800
Tag:    v2.5.4

Merge branch 'MDL-41246-moodle25' of git://github.com/StudiUM/moodle into MOODLE_25_STABLE

commit 27b1ba527a481c16ab7b38f5f22bd5512edfbb0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:41:15 +0800
Tag:    v2.4.8

Merge branch 'MDL-41246-moodle24' of git://github.com/StudiUM/moodle into MOODLE_24_STABLE

commit c5213d7e6ee335cd1c2a066d22da62e0325560f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:23:15 +0800
Tag:    v2.7.0-beta

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

commit 83797afa91f6baaf6403ba5e01def69dcfff6d36
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:23:06 +0800
Tag:    v2.6.1

Merge branch 'MDL-43438-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 1d5e5cc670f48733a2c1243d6c6fc206aa218f82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:22:53 +0800
Tag:    v2.5.4

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

commit 085c2fd228fb17e08eaebe4e189b08e615cb2900
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:22:37 +0800
Tag:    v2.4.8

Merge branch 'MDL-43438-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 235b5a0c1dbef6fa9e0072382d02e868bee4e2a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:03:51 +0800
Tag:    v2.4.8

Merge branch 'MDL-43250-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 77104a2bd2678b10139aa6f9e28677d2ac33cb84
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 05:51:00 +0800
Tag:    v2.5.4

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

commit d3220e229efa591bf25d6374bc5c40a838b8dc70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 05:44:04 +0800
Tag:    v2.6.1

Merge branch 'MDL-43250-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit ee70f10f99dc62ddbc2125fd5338c5617feb0d3a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 05:36:22 +0800
Tag:    v2.7.0-beta

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

commit a92617fa3f7c33e8b7914dd1792781e322470d5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 04:13:05 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43410-master' of git://github.com/andrewnicols/moodle

commit f2b1768da677d0d3dccef8add3d196246a69c978
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 04:12:47 +0800
Tag:    v2.6.1

Merge branch 'MDL-43410-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 6ac16bb9811a68a2047b2124817f4e5a3f47ff68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 10:58:04 +0800
Tag:    v2.7.0-beta

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

commit 1c5052e29fdb5b22ebf1f056327ce91104b5127f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 10:57:49 +0800
Tag:    v2.6.1

Merge branch 'MDL-35032-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit c7f13ceafc1efa808b89f7365f639990813cc0a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 10:57:36 +0800
Tag:    v2.5.4

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

commit 7f4fa839fe039f130abb5db7115366fbc6c34e9f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 10:57:25 +0800
Tag:    v2.4.8

Merge branch 'MDL-35032-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit faf4e51da9f5190884faa18becffaaa3b9f09367
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:35:24 +0800
Tag:    v2.4.8

Merge branch 'MDL-30195-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 7eba9ea8992e51947db267191cfda1a6c1616b65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:35:16 +0800
Tag:    v2.5.4

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

commit 61dde025a16de04aed8703f8d267ba1e7dd529e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:35:07 +0800
Tag:    v2.6.1

Merge branch 'MDL-30195-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 4a91dfdb0864de9489f4a6799a0f5dca142fa3eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:34:35 +0800
Tag:    v2.7.0-beta

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

commit 4cec4ee627d6c9fd3a5363c9fa94a390e211a527
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:31:58 +0800
Tag:    v2.7.0-beta

Merge branch 'w52_MDL-43367_m27_contextpath' of https://github.com/skodak/moodle

commit b10fec175071ebe99c34822e0103187d3eaee278
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:31:50 +0800
Tag:    v2.6.1

Merge branch 'w52_MDL-43367_m26_contextpath' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 3aba4d0f12be138842f343083c777bb96bfb001e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:31:29 +0800
Tag:    v2.5.4

Merge branch 'w52_MDL-43367_m25_contextpath' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit a7dae3ef8ea5ef1666705e3d752f39f8996aea59
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:31:18 +0800
Tag:    v2.4.8

Merge branch 'w52_MDL-43367_m24_contextpath' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 5c7e16db54eab8bdab55faad5a037e3fec706232
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 04:54:44 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-34182-master' of git://github.com/andrewnicols/moodle

commit 8ca4f69539a7f385c8c12651b848d9ed17b2f40b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 04:54:26 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43325-master' of git://github.com/andrewnicols/moodle

commit 2347fe54507776a201741ae541d48b4acdb21556
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:50:48 +0800
Tag:    v2.6.1

Merge branch 'MDL-43325-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 43d6e05c24d85c30d17c4392498de32e81e71b2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:16:23 +0800
Tag:    v2.6.1

Merge branch 'MDL-34182-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit d071a951e14251fd1e6fb5c25e4bfe48bb277291
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:15:57 +0800
Tag:    v2.5.4

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

commit a35428cf86004d566ed262109c23afcfe2b8a2fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:15:48 +0800
Tag:    v2.4.8

Merge branch 'MDL-34182-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 3dc592815af9ee069eaa5a5b444be3c8467b7853
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 19 Dec 2013 12:01:04 +0800
Tag:    v2.5.4

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

commit a0e11687513e33e25f773b3cf49a21307c0aae71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 19 Dec 2013 11:12:46 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges

commit 9f90cd755345942c35514a8b5ce9645a97dee8bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 19 Dec 2013 04:22:41 +0800
Tag:    v2.5.4

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

commit 2415e85716684ed3e2685eb91e6de4e3a67769a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 11:26:35 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43241-master' of git://github.com/andrewnicols/moodle

commit 47358bdaa58599dc6e30db90e48990e38a3d6dde
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 06:59:28 +0800
Tag:    v2.4.8

Merge branch 'MDL-42104_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 272e4400907b1188f1a48c6ac7d37edcf9d6ab8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 06:19:34 +0800
Tag:    v2.7.0-beta

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

commit 12c847fed95be78ad0e1f624542b1e04cb2e6774
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 06:19:26 +0800
Tag:    v2.6.1

Merge branch 'MDL-43235_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit f6c3162520a51cc802f879780f9507f1eb2f6bf0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 06:19:19 +0800
Tag:    v2.5.4

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

commit 2df83c2ea891746f412b24ea1c8e7d73a4b52e5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:52:41 +0800
Tag:    v2.7.0-beta

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

commit 2f73b98955ec85f6b45c9a4dcdc24dd6add6ff50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:45:13 +0800
Tag:    v2.5.4

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

commit 6a8e8ac25ede25224f0b0bcb2dc77f43fee2433c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:45:02 +0800
Tag:    v2.6.1

Merge branch 'MDL-43355_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit adfcdcb0276452330eab23bc203dcc48ac6ee5ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:30:30 +0800
Tag:    v2.7.0-beta

Merge branch 'w51_MDL-43213_m27_simplebehat' of https://github.com/skodak/moodle

commit 37f59a68bd63f88cbb7a3e8075c334cb82e5765d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:08:33 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41359-master' of https://github.com/mr-russ/moodle

commit 9b4c44c8e6cc5e3db6958fc27fa1e53c5c8affda
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:59:05 +0800
Tag:    v2.7.0-beta

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

commit f01cac675a1bdee1c7d65011c8024ce16b3a6c3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:58:51 +0800
Tag:    v2.6.1

Merge branch 'MDL-43074-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 04102046ef34802b8260c4c870d66a0183b93c27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:55:04 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43272-master' of git://github.com/andrewnicols/moodle

commit bf6529bbd42ea4ec168a98f15e92a01fa6fc0704
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:53:02 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43234-master' of git://github.com/andrewnicols/moodle

commit 5be3d8d32908bb46c75115843b667277b5c096aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:21:50 +0800
Tag:    v2.7.0-beta

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

commit 3aa576a8ef7087e203cf5ecc15ab6cf1d42f69f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:21:31 +0800
Tag:    v2.6.1

Merge branch 'MDL-38698-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 8a0ba53b9c21edc3429389035694b15bde43913e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:21:21 +0800
Tag:    v2.5.4

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

commit a39ff69d58b7a82df6fd63800299c4964219e340
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:21:10 +0800
Tag:    v2.4.8

Merge branch 'MDL-38698-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 32196e43ca16304037fba3f500af401a062fa260
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:18:32 +0800
Tag:    v2.5.4

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

commit 233e6b985ba3103b8ba6ddba1e888bd57282454e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 11:32:35 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle

commit ca3b2c9bcc481a2f1d79c2b17b8791ad0d37c567
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 11:20:34 +0800
Tag:    v2.7.0-beta

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

commit 9d771f95293df401533218a75ab1409aded3e722
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 04:31:19 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-39725_analyze' of https://github.com/mr-russ/moodle

commit 2b88fa0c90f17a11a990f286194a42a38fd9b369
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:54:33 +0800
Tag:    v2.7.0-beta

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

commit 21bb4f142c84866054e8fa35f8f971d7df363678
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:54:22 +0800
Tag:    v2.6.1

Merge branch 'MDL-25473-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE

commit 2a3ce2b33dc1914d3876c3002dc7529e5779e454
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:53:57 +0800
Tag:    v2.5.4

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

commit 1b5fea23bdf9d3d1ad210603bbbd0c521852dc46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:53:38 +0800
Tag:    v2.4.8

Merge branch 'MDL-25473-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit bb4551334fb3a3312bab9bbc3f9556891e9a677c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:48:08 +0800
Tag:    v2.7.0-beta

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

commit 7809633d79c37a6c3a81242c69dda5adaa7038a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:47:51 +0800
Tag:    v2.6.1

Merge branch 'MDL-34321-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE

commit 474a218fc8e8e6616f78de20ecdb70f1196d5789
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:47:37 +0800
Tag:    v2.5.4

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

commit 00621ce929ee5bd2f9a04e306d813e78bd36391c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:47:26 +0800
Tag:    v2.4.8

Merge branch 'MDL-34321-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 2b08f90aca1e8417647b1f6aa49fcec0e19ff0b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:45:05 +0800
Tag:    v2.7.0-beta

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

commit 7f574aadffc47a4d8f7f404d67ba08816cfce8f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:44:52 +0800
Tag:    v2.6.1

Merge branch 'MDL-36984-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE

commit 8e4e9d8d6719d95b15f359ccd065a848719f5eb3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:44:42 +0800
Tag:    v2.5.4

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

commit 0359fe71e28844a3884805d09e2525d79fa86fbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:25:08 +0800
Tag:    v2.7.0-beta

Merge branch 'w51_MDL-43268_m27_filternotice' of https://github.com/skodak/moodle

commit 9c099d21eb9952025b28cd414f458e795405a2a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:24:52 +0800
Tag:    v2.6.1

Merge branch 'w51_MDL-43268_m26_filternotice' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 21ad9a7921f380da79f18857b966fa4f9de9d356
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 11:03:09 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle

commit 9f5b319345fdc98f7778a01a74060868fa009330
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:46:56 +0800
Tag:    v2.7.0-beta

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

commit d431ff1f513a40b9353c5b2cff3b8e4216051207
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:44:15 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-21180' of https://github.com/rajeshtaneja/moodle

commit a3a8490d3a8779b62a29fb7ed324d09aa359b9f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:43:47 +0800
Tag:    v2.6.1

Merge branch 'wip-mdl-21180-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit 0c41eeda3a8be83a4a8f5d6153a31c5f340ce626
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:43:23 +0800
Tag:    v2.5.4

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

commit 4d3ee68536d9f312b9e2851d11c6a109b98cab29
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:43:12 +0800
Tag:    v2.4.8

Merge branch 'wip-mdl-21180-m24' of https://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit d84268502872fc83dc7aa6a25ae760d3cbab16f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:40:40 +0800
Tag:    v2.7.0-beta

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

commit e9623e55e31a30eb888b734a768f92811fa0aabc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:40:25 +0800
Tag:    v2.6.1

Merge branch 'MDL-43062-26' of git://github.com/mouneyrac/moodle into MOODLE_26_STABLE

commit 3c3eed7e01bcd505fa0fa15b3633528e0eb9dd72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 09:10:15 +0800
Tag:    v2.7.0-beta

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

commit e646b89f8b83a41eda7e413f744a8e6cf64857b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 09:09:52 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43348_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE

commit 92d66ed0bebea5dc50fb69c82820baf8f13a527b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 09:09:32 +0800
Tag:    v2.5.4

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

commit 3b94d80c20603a0a3a9bb955fe6bacdb2b0be789
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:52:16 +0800
Tag:    v2.7.0-beta

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

commit a0f5d96f1e44b1cffe8081632c36b6d0575968a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:52:03 +0800
Tag:    v2.6.1

Merge branch 'MDL-40096-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 1ebfb4a6c606d4e6eb246a761fa99cc71bf31149
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:51:53 +0800
Tag:    v2.5.4

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

commit 6a68b92cff3cd7c9f04e4351b4c426ed4287edee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:50:44 +0800
Tag:    v2.4.8

Merge branch 'MDL-40096-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit c57864b76f788ea6b184c84461781ee9ab98c9c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:47:57 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges

commit db23e92670658ea5f55cdffd898731909997cb2e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:31:29 +0800
Tag:    v2.7.0-beta

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

commit 45c058331283a707f965648923b28bc8ad23aa2a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:31:13 +0800
Tag:    v2.6.1

Merge branch 'MDL-40436-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 960edf3828724e65835be4d22dbed8f4ec8ab63d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:31:02 +0800
Tag:    v2.5.4

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

commit 1ce52ce8db41f7d0a124b78ae8b9c2351b9e1560
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:30:14 +0800
Tag:    v2.4.8

Merge branch 'MDL-40436-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 224428980963d4d5be2d4b0c18ace24d9e667f22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:18:02 +0800
Tag:    v2.7.0-beta

Merge branch 'w51_MDL-42931_m27_env27' of https://github.com/skodak/moodle

commit 05a423d850b2c47eb3319592da483a4f31e39e02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:17:46 +0800
Tag:    v2.6.1

Merge branch 'w51_MDL-42931_m26_env27' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 7827adcf282e2f82cfbb9e793cba8cb83eb5657d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:17:33 +0800
Tag:    v2.5.4

Merge branch 'w51_MDL-42931_m25_env27' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 7d07632f7a421404cd11b10a018746d6d1dd1831
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:17:19 +0800
Tag:    v2.4.8

Merge branch 'w51_MDL-42931_m24_env27' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 063baa62b5c36cdcd53b16b6afc5b3ef5af43223
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:11:38 +0800
Tag:    v2.7.0-beta

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

commit 12869bfdb12649b0793a27d19e699366cf6e1148
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:11:26 +0800
Tag:    v2.6.1

Merge branch 'MDL-42085-26' of git://github.com/mouneyrac/moodle into MOODLE_26_STABLE

commit 13ab45efe4e8bf9a0e8b0b299967cd59abe56128
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:11:18 +0800
Tag:    v2.5.4

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

commit 34965b0d31ba03caa6190725010da8eda8127a46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:11:05 +0800
Tag:    v2.4.8

Merge branch 'MDL-42085-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit 6015500d5be96192758961d2a316b7fbdd9fe471
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 04:46:47 +0800
Tag:    v2.7.0-beta

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

commit 909f01f17ec13117216604d0e62ff3dcc211e204
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 04:46:32 +0800
Tag:    v2.6.1

Merge branch 'MDL-43326-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 40d3bc442fba7a6af145a457dc54dad3818dc576
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 13 Dec 2013 11:59:31 +0800
Tag:    v2.6.1

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit 90dec729a5dcafc4722e21acab7c0c140ab305db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 13 Dec 2013 11:59:23 +0800
Tag:    v2.5.4

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

commit ebe7179a88356836492628453de0f54d200cc120
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 13 Dec 2013 11:59:16 +0800
Tag:    v2.4.8

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit 61b46e4c4d343e5191d478b61ed7bd6730d6fa33
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 13 Dec 2013 11:59:08 +0800
Tag:    v2.7.0-beta

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

commit 623d49dde472aec86973618b31697e9d46c13540
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 12 Dec 2013 04:13:42 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle

commit 445e63ecd8b2b5d052949cb30269bc7ea745967a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 10:32:29 +0800
Tag:    v2.7.0-beta

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

commit e453c70d143d2498f8455e3c45f2bc8fe46f6840
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 07:30:26 +0800
Tag:    v2.7.0-beta

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

commit 1092f63a80eba5c6476e753967add15f31c99b25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 07:25:16 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-38775-master' of git://github.com/andrewnicols/moodle

commit 5cc0c2c41d9b917680179ccdc29b907c908c932c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 07:25:14 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-38776-master' of git://github.com/andrewnicols/moodle

commit 745801263713cae829aa72f60fa6df8ea5c1c077
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 07:25:12 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43202-master' of git://github.com/andrewnicols/moodle

commit df1498f711bd173787dc1326c7b94287bcad3388
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:13:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle

commit 5fbc32ebdbdad279c6731b6f9b8c1bc1aea53124
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:12:55 +0800
Tag:    v2.6.1

Merge branch 'MDL-42796-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 87176b481e091158839d1616668469dbd907d302
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:03:39 +0800
Tag:    v2.7.0-beta

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

commit 9f00dabf864562889491014344d8b1f000a21c22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:03:23 +0800
Tag:    v2.6.1

Merge branch 'MDL-43252-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE

commit a458eacede7c13a353c3ab2651d726752ee979a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:03:14 +0800
Tag:    v2.5.4

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

commit 78144bd2e71da72ab010d11432553053fb3fc407
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:59:21 +0800
Tag:    v2.7.0-beta

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

commit 51d311f703f2c9fd146d7b25dd2dc7306102ff89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:58:49 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43279-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 0dc8e800979f5d28f41488abb2ec708a1c494fdc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:58:31 +0800
Tag:    v2.5.4

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

commit 133870d7595f1914392a48d30592d37df94553c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:57:46 +0800
Tag:    v2.4.8

Merge branch 'wip-MDL-43279-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit 3ef86b39098ea54f8d869a7493ec6ccb746b0c98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:51:21 +0800
Tag:    v2.6.1

Merge branch 'w50_MDL-31625_m26_replace' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 3f35f367cbf80384dbb8b285bf0fa5a797a425a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:50:07 +0800
Tag:    v2.7.0-beta

Merge branch 'w50_MDL-31625_m27_replace' of https://github.com/skodak/moodle

commit ebb9daa5e1cf196b6f7fde63ed5127a867d1f80b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:34:17 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle

commit bdb2677b79250de4f8f14cd891cc5b6905bb245d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:34:04 +0800
Tag:    v2.6.1

Merge branch 'MDL-42959-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit b6df1b3ab36e7aef65e82cf03f32ad2ba446144f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:32:06 +0800
Tag:    v2.7.0-beta

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

commit fd0281dfc3461cb23580eda9ecb8d7364044a987
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 05:27:45 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle

commit a88c1ca91a4112b9141e48ac6629d896ec2db65c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:52:08 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43164-master' of git://github.com/andrewnicols/moodle

commit e5bb9741b646b2fece10177c19dc75e1a9557a12
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:50:27 +0800
Tag:    v2.6.1

Merge branch 'MDL-43164-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 176521e560a3e91eb2b2117a401c4465a6eb6e5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:25:51 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle

commit 830299fe4f15f30cb7f5858443b87aab7f2e1d3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:21:10 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle

commit c7f545bbb0dd713e063df5738c8e497ea563a8c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:20:33 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle into MOODLE_26_STABLE

commit 69a40654d85e47f9cfb9bd67489aa3228a4cc56e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:20:17 +0800
Tag:    v2.5.4

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

commit 8f2bd073aaeee80cbfa46084ae922fcdf4edef83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:09:06 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43253-master' of git://github.com/andrewnicols/moodle

commit c8d6ee98702117830773119ddbe0b89b8f8718ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:07:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43212-master' of git://github.com/andrewnicols/moodle

commit 437fd401f92a6032892c23006f39ad81f8bf13d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:06:54 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43232-master' of git://github.com/andrewnicols/moodle

commit b78f0294bb1fff2f91c67f61ae9fcff9e7be7634
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:48:33 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43194-master' of git://github.com/andrewnicols/moodle

commit b2a803d5d1620641c16b35ceb81b4df194ae4917
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:48:04 +0800
Tag:    v2.6.1

Merge branch 'MDL-43194-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 0da3aac317a6c726c0b303a0f8f151fcaaa5ef34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:47:46 +0800
Tag:    v2.5.4

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

commit 822f52901407dbe55fb305afd330c9255e051082
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:43:50 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43152-master' of git://github.com/andrewnicols/moodle

commit 8eb717f9936970bfbc55e4895cc0d7541056b16f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:43:36 +0800
Tag:    v2.6.1

Merge branch 'MDL-43152-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit aa1549681af897c5bd95d8c5298f8ed13fa7bf15
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:43:23 +0800
Tag:    v2.5.4

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

commit e3f7ac09e7cd6e2be6a498bcdf31aa82b713466f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:36:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle

commit d12121f3856efc891e02cbc386b3f8246fbbc286
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:28:56 +0800
Tag:    v2.5.4

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

commit 71e7d2552b8e8470c952bc00eb5c7b3dbd4be4bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:28:35 +0800
Tag:    v2.4.8

Merge branch 'm24_MDL-43019' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit ec6219a2e7a2d38c458cbe8d458a0393ee78ba32
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 Dec 2013 03:25:35 +0800
Tag:    v2.7.0-beta

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

commit ba9935866a3d617edeb16a65ffe4ff0223a4b608
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 Dec 2013 03:07:59 +0800
Tag:    v2.7.0-beta

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

commit 5ba212b4445d3e825fefafd8942fc755d969b84c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 10:29:00 +0800
Tag:    v2.7.0-beta

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

commit c7cde40bb5da19d87a0e8524920b157b05c8ae06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 06:52:23 +0800
Tag:    v2.5.4

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

commit 8e60097af88ff17a5f4e739882889c6d48202c59
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 06:52:18 +0800
Tag:    v2.6.1

Merge branch 'MDL-41592_26' of https://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 5d288a5dbbbf1b0f0efc2de54f286bd9aa0d17f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 06:52:12 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle

commit 12f46583f00be0291a45b46ac9a42ffb90bb1e20
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 05:12:12 +0800
Tag:    v2.7.0-beta

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

commit d653c838b0d7547740c2f6a63ef2c7616d8dd603
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 05:11:51 +0800
Tag:    v2.5.4

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

commit 4f1342366344cdc7289e58ec4486f19e73420124
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:49:29 +0800
Tag:    v2.7.0-beta

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

commit 2a336e2a36f0360d45fa06e2242bdba59793cbc6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:44:25 +0800
Tag:    v2.7.0-beta

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

commit db9c8f4c7d6b1a970990a2c1f334f573bf85764c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:43:43 +0800
Tag:    v2.7.0-beta

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

commit f5a134213d18812576a75109b565a5a21a94344c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:43:24 +0800
Tag:    v2.6.1

Merge branch 'MDL-43065-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 7ac957682535fdf3d40ec719ad67e0ebed9c18c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:42:34 +0800
Tag:    v2.6.1

Merge branch 'MDL-42919-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit a59a423926c0688954ecc6e70e011179ce430438
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 06:12:34 +0800
Tag:    v2.7.0-beta

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

commit b5fd2497d66eab81293067002c3366d74ca7f347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 05:25:26 +0800
Tag:    v2.7.0-beta

Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle

commit 1cb0536bcb106f0686fecdd1cded0a3331e1c545
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 04:58:10 +0800
Tag:    v2.6.1

Merge branch 'w48_MDL-41819_m26_maxinputvars' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit f591b27e11ebcfce7a62fd52d4ac74f58c1deb03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 04:57:25 +0800
Tag:    v2.5.4

Merge branch 'w48_MDL-41819_m25_maxinputvars' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit dc76ce70b232c40cb443859785da2462b1e5fef8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 04:57:03 +0800
Tag:    v2.4.8

Merge branch 'w48_MDL-41819_m24_maxinputvars' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit c619d3d48d92077a01cbdcd71a87f85464565db6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 09:04:09 +0800
Tag:    v2.7.0-beta

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

commit 12539749f478643be9dfeee987e52f71aa298eea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 08:44:05 +0800
Tag:    v2.7.0-beta

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

commit f098ca6d97808ceabfff929218a2bcc19f9e1ca0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 08:39:51 +0800
Tag:    v2.6.1

Merge branch 'MDL-42918_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE

commit f2d7e2dca9b95c50acea30ba26ba84cc1cdd3ac5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 05:52:11 +0800
Tag:    v2.7.0-beta

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

commit 06ef842707c0b2679f1cf80910b66ec0dbf7e32c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 05:35:46 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-33618' of https://github.com/rajeshtaneja/moodle

commit 8d5a9d6ec11990536f2478c5e7980fa0d7158452
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 27 Nov 2013 07:36:02 +0800
Tag:    v2.7.0-beta

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

commit f9cb086dfc0107d3b078655e643930183d0c0e79
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:42:25 +0800
Tag:    v2.7.0-beta

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

commit 4cedd8fb9da1f9d174dec90612552fcabe5c95ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:42:02 +0800
Tag:    v2.5.4

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

commit 10123d02f6c4c5628de02baf7090c513c265ce9e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:41:48 +0800
Tag:    v2.4.8

Merge branch 'MDL-43005-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 657b29e7bcd2295fef816f7e608170d5ffe4bcf9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:36:36 +0800
Tag:    v2.7.0-beta

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

commit 390896d3d95671a670a58172aafdfdcf8f038509
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:36:09 +0800
Tag:    v2.6.1

Merge branch 'MDL-43037_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit 417d6f51cc246a13bc414b584a5e73bbd6b8ea16
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 09:37:28 +0800
Tag:    v2.7.0-beta

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

commit 8b5e008bc22152d977012bcf238705c691219902
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 09:31:51 +0800
Tag:    v2.7.0-beta

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

commit 496692fb9d5f16e1665e92bd181a83d4a90bb021
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 09:19:20 +0800
Tag:    v2.7.0-beta

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

commit 40dca7e4d69cfbd18c34b0b30999ae701d4ca795
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:28:08 +0800
Tag:    v2.7.0-beta

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

commit 4f314c0d62dcad486727b78cf3e5a18dadd92130
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:27:55 +0800
Tag:    v2.5.4

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

commit 12bba6cc09421cadf58101481911f04a71c90e86
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:27:45 +0800
Tag:    v2.4.8

Merge branch 'MDL-41316-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 35a197898552c2cdcd6a95475f0dbe2c797b4fb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:24:56 +0800
Tag:    v2.7.0-beta

Merge branch 'w47_MDL-42612_m27_paypalruble' of https://github.com/skodak/moodle

commit a34073eeb886694dc207e51b219ab1f475a0849e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:24:41 +0800
Tag:    v2.6.1

Merge branch 'w47_MDL-42612_m26_paypalruble' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit b85181b3cd8ab13ef5557fcb9194a9eeb28305f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:24:28 +0800
Tag:    v2.5.4

Merge branch 'w47_MDL-42612_m25_paypalruble' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 40ce744d0871286084909c0e7c79f41388bc8687
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:06:29 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42774-master' of git://github.com/andrewnicols/moodle

commit d9ca430e4fec15f4f6a55f8af4c441f2222ebeb6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:06:08 +0800
Tag:    v2.5.4

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

commit 074e5686db18805493a9644c5961ee78ba6e8c5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:03:41 +0800
Tag:    v2.7.0-beta

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

commit 37c71ce3cc54ce126e6778dc6e360e12eecac3cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:03:25 +0800
Tag:    v2.5.4

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

commit c53ee31d464c86f2095ca7f1bd02ca597e9eb952
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:03:14 +0800
Tag:    v2.4.8

Merge branch 'MDL-42863_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 04fcb4a96cbb8ce006078b996d20458e7e2eb2be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 06:50:44 +0800
Tag:    v2.7.0-beta

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

commit a073d7c8b0222f162da3d7177b1d91f036a65152
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 06:50:32 +0800
Tag:    v2.5.4

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

commit 7bfd34244580e867bc6c8d6712b78369cb81ebea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 06:50:23 +0800
Tag:    v2.4.8

Merge branch 'MDL-42865_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 31767636d8630d2be8335964b1b5cfeacd08755b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 06:43:42 +0800
Tag:    v2.5.4

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

commit d7a0da37d9f031bd14d9ddf7ea480632bebc8f01
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 06:42:25 +0800
Tag:    v2.7.0-beta

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

commit 1098226524271901dc9051406cd2b650ce121e05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:15:33 +0800
Tag:    v2.7.0-beta

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

commit ca8790e981d8b6948dd063fea8b991dd648e0da3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:13:13 +0800
Tag:    v2.5.4

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

commit 64b4fbebd85a3155c234abd046efe65e9e5925aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:09:18 +0800
Tag:    v2.6.1

Merge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 34592ffd98e998d8544b4624b40dd60e52e3008c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:08:45 +0800
Tag:    v2.7.0-beta

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

commit 5b8ead0e73f021156cbe7bd8bb96d3a824f7ef15
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:08:05 +0800
Tag:    v2.5.4

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

commit 7d181fd82dddad87e28aacecb939c4b7d1e8bd14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:07:49 +0800
Tag:    v2.4.8

Merge branch 'MDL-42853-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit c31fc5a099055bddddf01710d56555f9816ee307
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 16:30:39 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42812-r1' of git://github.com/abgreeve/moodle

commit b8a598ad6591ded8c436430e5a5d43fb75969f72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 13:53:08 +0800
Tag:    v2.6.0-rc1

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

commit 0ac5863d862e5b00d65ee22ec95c0f9de9e1218b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 13:20:12 +0800
Tag:    v2.6.0-rc1

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

commit 6f4a169d8e50cb77561caa8e9d9e3351931c7549
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 11:34:39 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle

commit 68bcc3faaf722d3da4fb83892cd61d959e468fe9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Nov 2013 14:10:21 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42795' of https://github.com/rajeshtaneja/moodle

commit 36c192677e8408660326a4e365595ee146f8664a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Nov 2013 14:09:54 +0800
Tag:    v2.5.4

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

commit 0fd6069ecd81eee278e54bebc3d32e1e191653a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Nov 2013 13:10:44 +0800
Tag:    v2.6.0-rc1

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

commit 16a14e4a5f2b19f725dbfdc9d0da81033526bae1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 07 Nov 2013 11:29:57 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-MDL-42739_M26' of git://github.com/lazydaisy/moodle

commit 8e23283cbbbfa761299cbafecb8e681bea0b21d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Nov 2013 14:24:46 +0800
Tag:    v2.6.0-rc1

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

commit acdb2159fb59ade51e21c23b2046b7249719597a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Nov 2013 14:00:30 +0800
Tag:    v2.6.0-rc1

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

commit 6d50856c1f560e07f3357068328425a7363adcd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Nov 2013 14:00:19 +0800
Tag:    v2.5.3

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

commit 9620bcebee54514f267607871cd6570fe0138504
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 16:00:30 +0800
Tag:    v2.6.0-rc1

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

commit 121de7fe9fee98788aa24a5d5a143deceba1e346
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 15:08:49 +0800
Tag:    v2.5.3

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

commit 65c6eb8141ca7100464994136c22e1d466846ec5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 14:19:41 +0800
Tag:    v2.5.3

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

commit ab4fdbdf42416be9ad9be3f9cff0cd3c2d2296fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 14:15:44 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42284_behat' of https://github.com/andyjdavis/moodle

commit 2e29034313f5d43287553d7e7c00a6141a7a5cf3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 13:44:56 +0800
Tag:    v2.6.0-rc1

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

commit 4d5be0764a93df33f8bf126319835dc7bc84e158
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 13:44:48 +0800
Tag:    v2.5.3

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

commit c3673c5531face85e6bbebbddf3d126a3109d436
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 13:44:39 +0800
Tag:    v2.4.7

Merge branch 'MDL-42574-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit df2d3777ccbf02329d605619b91ca6025bbc1706
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 08:40:08 +0800
Tag:    v2.6.0-rc1

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

commit 0460b39c135a09bd152b685b002f7396db9555e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 08:39:24 +0800
Tag:    v2.5.3

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

commit 1f26c7053ad9d68b696073ab33b280989f14490f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 08:38:47 +0800
Tag:    v2.4.7

Merge branch 'MDL-42542-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 28fef14840ed48687e07986a32ab972e430a279b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 11:06:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle

commit c80ef689d5c07a1d926bab4411cc1f491978734e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 09:40:02 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-mdl-41744' of https://github.com/rajeshtaneja/moodle

commit 9c60ab15139225e574805caf7fdde10fbe46d9a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 09:39:32 +0800
Tag:    v2.5.3

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

commit 49e3cda704e59a63aab59e936b1b25039e0c7d88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 09:39:24 +0800
Tag:    v2.4.7

Merge branch 'wip-mdl-41744-m24' of https://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 2dc15b1011f26a161a9d0a3c3451e6668993f4ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 03:37:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle

commit 2219f50a103eac8d44c5cda7b66f650e953ab28e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 03:34:11 +0800
Tag:    v2.6.0-beta

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

commit d00b3f19b9e8cf726b49cc4e9df9cbb1c0974d11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 11:25:22 +0800
Tag:    v2.6.0-beta

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

commit f18f96f767af3ca4cbd6e12e6cb0ec6e990217eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 10:57:30 +0800
Tag:    v2.6.0-beta

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

commit 571781fbf6337468aa1ce83cbf4da5af8af6b5f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 07:41:36 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle

commit 08f95ac5e5b6f52466a5bc950a7b58d1ae3d4ae6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 04:23:53 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle

commit 9d1b909a9c8ae247f58bda982bba6f5c50370cff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 03:54:46 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41956_master' of https://github.com/totara/openbadges

commit ff8e2578676dd39c7d38624e35493f573bcdd8ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 11:04:05 +0800
Tag:    v2.6.0-beta

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

commit cbf34f34cccbe5200b580d0fc853124c981b52a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 09:43:36 +0800
Tag:    v2.6.0-beta

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

commit 87f28ddceb41330d6b3850a06d1b13f4e114c62e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 06:20:51 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle

commit 8050eec577a7341935e47385e938d5a63658cbec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:52:42 +0800
Tag:    v2.6.0-beta

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

commit 06db3cf3cc2578fd01af4a4e6bbec30095b783f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:52:04 +0800
Tag:    v2.5.3

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

commit 6455dec02db8c0b45a762ed7905a26abb2cc6f3e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:48:43 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41215-master' of git://github.com/andrewnicols/moodle

commit 81a939be02a787094f04c3c04babe1bcdd2b9b09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:27:46 +0800
Tag:    v2.6.0-beta

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

commit 4d00df46b19132fa0abae690a4f5ff3bd7569e53
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 12:38:25 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle

commit 8618757c66b1e206b9d87a9b169ff35522961469
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 10:51:45 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-41220_m26_pluginlist' of https://github.com/skodak/moodle

commit 6ac0b011759e3b1f3eccd85386325c83e715900e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 10:40:48 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42072_master' of https://github.com/totara/openbadges

commit 2ec16f735aeedefa992d9be4b8467bf5f6bac3cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 10:39:42 +0800
Tag:    v2.5.3

Merge branch 'MDL-42072_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 4c9da232d05f324d4f077aace13393b2da7b2c27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 08:43:08 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-41197_m26_convnotices' of https://github.com/skodak/moodle

commit c50daf9ae7e33f8322224cb0d34ee3341f9d321e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 08:42:47 +0800
Tag:    v2.5.3

Merge branch 'w41_MDL-41197_m25_convnotices' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit d6cb394f2c749b3ed2f961550885f556f1ecef94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 07:50:29 +0800
Tag:    v2.6.0-beta

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

commit 93bf71cd8eb162e1a795b2c8aa6567b8ffb98867
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 07:34:07 +0800
Tag:    v2.5.3

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

commit 577fc805a200a826490dca96d9aaf38e34235474
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 04 Oct 2013 10:43:52 +0800
Tag:    v2.6.0-beta

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

commit af911b089a4142d802515b1d2eaee72bec419362
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 04 Oct 2013 10:43:45 +0800
Tag:    v2.5.3

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

commit d0012b72ad366dd3a66192ed672ea1349280e60d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 04 Oct 2013 10:43:38 +0800
Tag:    v2.4.7

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit 7f62e4040aeeadc90ecdf345d8442d839c9cddcb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 04 Oct 2013 03:25:58 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle

commit 322ca2fc66d95320f975bbf3209a6f6dc2c14948
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 03 Oct 2013 11:03:22 +0800
Tag:    v2.6.0-beta

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

commit c7387be83b99971576d487f2244309e6443b2aa4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 03 Oct 2013 03:34:39 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-16464' of https://github.com/timhunt/moodle

commit 18f04ab62520eb1dfa7743fd312361ee9772393e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 07:10:08 +0800
Tag:    v2.6.0-beta

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

commit 6579a7b7910e88f45df71da618b172ad36f1ba51
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 06:36:16 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle

commit 55fcb3504f6203fa5fd214982be80636b16aa760
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 05:52:03 +0800
Tag:    v2.6.0-beta

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

commit 49b38d141e0db01cc189dfabffcf05fceb5f9dd0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 05:36:56 +0800
Tag:    v2.6.0-beta

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

commit 28a6f665f4ef5e7caf7147b573018331bf8e2e23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 05:27:54 +0800
Tag:    v2.6.0-beta

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

commit 7f58018843213a81626e5b439da6b08dea4b1ccc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 03:14:36 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41878-master' of git://github.com/andrewnicols/moodle

commit c78fdd8db3f4d6efc775603c38d4324d1f1753b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:50:53 +0800
Tag:    v2.6.0-beta

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

commit 8c90bbcde00dad229912133ce049f8d0f8234ed9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:50:13 +0800
Tag:    v2.5.3

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

commit 49c29a3f4643d900c40e9fb4341998b9d6ca7cb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:49:55 +0800
Tag:    v2.4.7

Merge branch 'MDL-41995_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 421dd2e8ebe8eeea0aea430d8c8a06c1af34b346
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:35:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41900-m' of git://github.com/micaherne/moodle

commit ae9f3c0671e448b6485c7fb178fae95142683b3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:35:37 +0800
Tag:    v2.5.3

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

commit 92fdea041d4e21370c235eb5eb33f84992e18216
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:35:27 +0800
Tag:    v2.4.7

Merge branch 'MDL-41900-m24' of git://github.com/micaherne/moodle into MOODLE_24_STABLE

commit 9b2fdfab44479dd05e8119abc60fb1bc0a933d50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:06:28 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41933' of https://github.com/merrill-oakland/moodle

commit 5101954f03e63ca6fc32856b3a16e3fd9d9f5da5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:58:17 +0800
Tag:    v2.6.0-beta

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

commit a0a63fa52625ffd99e6c98374bb7af0ada768bd0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:45:18 +0800
Tag:    v2.6.0-beta

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

commit 82ce52426eae0a2708d0a059dbdeeda3668211ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:44:54 +0800
Tag:    v2.5.3

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

commit a7fd94957177f879cdabb2784dc9c5c3f4bc676c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:44:44 +0800
Tag:    v2.4.7

Merge branch 'MDL-41894-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 52dc898d167b6f2ed196b798c33d8bc0b4ff2d80
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:37:44 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41228_master' of https://github.com/totara/openbadges

commit b45f2c01c6739570bdffb55493533745e98ef815
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:37:29 +0800
Tag:    v2.5.3

Merge branch 'MDL-41228_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 53be2d782a038f085508d6c54d6a1278553d7883
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 07:07:22 +0800
Tag:    v2.6.0-beta

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

commit 5e319f510105796b9930437e8d78a502ec410cc2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 06:18:14 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-37559-m26-showshortname' of git://github.com/henesnarfel/moodle

commit 7da590c11b0e84b62b740ad763a72e2cb890e779
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 06:05:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40572_master' of https://github.com/totara/openbadges

commit 7bd5d84fd89132d306aa96ea5106b348bc6dba5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 05:17:13 +0800
Tag:    v2.6.0-beta

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

commit bd5797e6cce3ac6b0406c046910b64d9c777c1ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 05:14:04 +0800
Tag:    v2.6.0-beta

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

commit a45ff7d8a6031b13bfa019dbf7939aaa68cc485c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 05:01:16 +0800
Tag:    v2.5.3

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

commit c3923927255cdd37a4dfef2edf809d307f7e3b67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 04:54:26 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37973' of https://github.com/merrill-oakland/moodle

commit 3f4b04ec3e1efb1d1566c3ab37d2e3b30ec4d989
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 04:53:56 +0800
Tag:    v2.5.3

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

commit 92416730d17e280773a0c9f0ee97b5e503cc7d65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 04:53:19 +0800
Tag:    v2.4.7

Merge branch 'MDL-37973_m24' of https://github.com/merrill-oakland/moodle into MOODLE_24_STABLE

commit d55c29562bca937e66109a9795d4ffc7a533d875
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 11:34:51 +0800
Tag:    v2.6.0-beta

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

commit 73cc3bdeb0ea4146201506651f22f3d331dcf833
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 11:15:53 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle

commit 4754755625e0c5e116cf9230a880ed9061f13ed7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 10:42:03 +0800
Tag:    v2.6.0-beta

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

commit 00a28794128f0f312251718d287ceb6105a7db78
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 07:09:50 +0800
Tag:    v2.6.0-beta

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

commit 28a2ecc6c469a8bceaff38951da978d5f0b05087
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 06:55:19 +0800
Tag:    v2.6.0-beta

Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle

commit e2c4c4202ddaf8938f00dc646d7e1e7d1da41625
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 05:48:36 +0800
Tag:    v2.6.0-beta

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

commit fea809a7b89ada98cc9a7f508e49f9eaf7ee2ccc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 05:45:44 +0800
Tag:    v2.5.3

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

commit 2f0a996b101b8d0e0cab1acbbd31e90f02abbfb5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 05:38:11 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41888-master' of git://github.com/jamiepratt/moodle

commit 322d9c8cdafccbd5143ff6ac0abc3664d2e3815f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 27 Sep 2013 07:32:05 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle

commit bc29e8f07a3fa38c44134b81ba74c2a86cc41af3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 26 Sep 2013 06:13:01 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle

commit e50df55c919aac76b503704687ac50bc79eeed7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 12:27:09 +0800
Tag:    v2.6.0-beta

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

commit 6eef32525ecaad13daf157b5c48785cbc2060dd1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 06:18:30 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41907' of https://github.com/merrill-oakland/moodle

commit b8cf62bf047a891acaeb4d4f7f1de73d8e4dc71f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 06:18:13 +0800
Tag:    v2.5.3

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

commit 77b4970559a685acd4fd3e2d4323afb64ffc8a2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 06:17:55 +0800
Tag:    v2.4.7

Merge branch 'MDL-41907_m24' of https://github.com/merrill-oakland/moodle into MOODLE_24_STABLE

commit 35ed37be8f41977e5d3f5131c7a62f00098d6c15
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 06:02:57 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40835_master' of https://github.com/nadavkav/moodle

commit 548fbd8e1c906b48019fd97a472cc76aeb2c5c64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:59:31 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39730_master' of https://github.com/nadavkav/moodle

commit 4b005d875156eef8f783a0dddbd177f44e739407
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:49:29 +0800
Tag:    v2.6.0-beta

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

commit 1f6181e5aa656223d9aee94594cfc9db32389a23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:31:43 +0800
Tag:    v2.6.0-beta

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

commit a78e39e3d31b7acd9b54cb4bd39d6bd356424320
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:27:44 +0800
Tag:    v2.6.0-beta

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

commit 40643dcaad96e4c73b57c8c995ca87d208361c5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 17:16:29 +0800
Tag:    v2.6.0-beta

Merge branch 'int_behat' of https://github.com/skodak/moodle

commit 1f4f0901d0fc3a6569b4f4768b936ba3aa3dbd10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 08:14:16 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41904_m26_markdown' of https://github.com/skodak/moodle

commit fb45f406a196f5e8fdf65d607300b60ffc940c16
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 08:09:47 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41903_m26_typo3' of https://github.com/skodak/moodle

commit 0eee7f9b43e08c27ed5934854cdc935648328978
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 08:01:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-40107_m26_tcpdf' of https://github.com/skodak/moodle

commit 0fd451b7adcf8a7db9dc74af9699e1d1499afa92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 06:02:58 +0800
Tag:    v2.6.0-beta

Merge branch 'WIP-MDL-39871_master' of git://github.com/nadavkav/moodle

commit 96218d0edbdbe7c3b6578ac8a8d72afdaeb037a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:37:10 +0800
Tag:    v2.6.0-beta

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

commit 72ca4b0acf9d4344ae9650092d37d926031f170e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:17:52 +0800
Tag:    v2.5.3

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

commit b3af3bbb963bcf7e6e526251918022dd82f58826
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:14:37 +0800
Tag:    v2.6.0-beta

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

commit 339feb64205c212f1e4084b0b39ce9952cf5cc01
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:04:27 +0800
Tag:    v2.6.0-beta

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

commit c99fcebdedcd45925a500ac3291fc2b9728890ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:51:41 +0800
Tag:    v2.6.0-beta

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

commit cc6a0ec48f68ccd1c7f7e05c56a773a32bc00a68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:33:10 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-36465-master' of git://github.com/andrewnicols/moodle

commit 9b70e23754707d7e5483f4858c486db1d43bcad2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:32:57 +0800
Tag:    v2.5.3

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

commit fb092979bfae40b84d4927355abb06e13e89975e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:32:46 +0800
Tag:    v2.4.7

Merge branch 'MDL-36465-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 83c875a9a05f7057aab29755be3cc2905ce726d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:28:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41591_zindex' of https://github.com/andyjdavis/moodle

commit d99847a338a6813ed08ad14ecaa2cb95c4c858af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Sep 2013 11:02:49 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-31501_m26_sessionreboot' of https://github.com/skodak/moodle

commit 0f00c5c59493f366fb844baed6d33bff06f47cf1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 20 Sep 2013 10:34:56 +0800
Tag:    v2.4.7

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit 158785810a80f2626ebdb4967bba24d06207a0d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 20 Sep 2013 10:34:46 +0800
Tag:    v2.5.3

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

commit 2e79f57db9cb0d641789762c611a826e956574dc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 20 Sep 2013 10:34:25 +0800
Tag:    v2.6.0-beta

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

commit 669755a423b73f6db285114332271207af05ce6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 19 Sep 2013 05:49:31 +0800
Tag:    v2.6.0-beta

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

commit d4d97627d2ffce96e86abc06e2d11d48dd07232d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 11:26:06 +0800
Tag:    v2.6.0-beta

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

commit 26c9c586c9a33520e136d4c09da9011ccad7f6ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 10:30:16 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41572-master' of git://github.com/jamiepratt/moodle

commit 23eed08e1a3e82732246b1d5aab50c97ec7fc24b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 10:02:47 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41540-master-v2' of git://github.com/jamiepratt/moodle

commit 81ece3f7aac155247ee99826160036240a35e94b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 10:00:15 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41571-master' of git://github.com/jamiepratt/moodle

commit c8f052dbdd14964d107103b588201f33bb5d6b29
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 07:44:39 +0800
Tag:    v2.6.0-beta

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

commit 77365f7ff68f292860459184d1aebcbd6987e8d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 05:02:32 +0800
Tag:    v2.6.0-beta

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

commit f34af1167acb6696d188fb64a8b65336fd36a789
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:59:08 +0800
Tag:    v2.6.0-beta

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

commit b27ca3514ed22894151f27347d308441834579c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:58:33 +0800
Tag:    v2.5.3

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

commit 82b2bb5eca5bceb8e351265e5673fe774a80a1f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:50:38 +0800
Tag:    v2.6.0-beta

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

commit c2e7f9042761c65dd5a4e59b83e8fcb311eba0ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:48:59 +0800
Tag:    v2.6.0-beta

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

commit 0dd46bb851f510ee32b45b1946fe5055711bfa17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:39:14 +0800
Tag:    v2.6.0-beta

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

commit 6d05276c0203cd1b5831fcecf5b58c25f6310b75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:39:02 +0800
Tag:    v2.5.3

Merge branch 'MDL-38317-moodle25' of git://github.com/StudiUM/moodle into MOODLE_25_STABLE

commit 1d5c18879822cc19549a484a7b88782da316c270
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:38:51 +0800
Tag:    v2.4.7

Merge branch 'MDL-38317-moodle24' of git://github.com/StudiUM/moodle into MOODLE_24_STABLE

commit 31dea4fea43a4cb7c752c70c0372738614a69630
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 11:07:57 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle

commit da8cd86f173a7487b1e8d5f89cd48d3b799f34f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:56:05 +0800
Tag:    v2.6.0-beta

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

commit 82dc37c88c23d4bb0835dd4a3a509575a1d638ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:55:25 +0800
Tag:    v2.5.3

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

commit ac7cbc012e8eb00568332cc08f87df673811f2ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:54:52 +0800
Tag:    v2.4.7

Merge branch 'MDL-38194-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit efc2c5171280df1f463f40193d90bf18001d7927
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:51:12 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41637_master' of https://github.com/totara/openbadges

commit c998a75fdbcf9395418f31d5fd00afb5c0bc1f11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:50:54 +0800
Tag:    v2.5.3

Merge branch 'MDL-41637_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit db220c29723fc509c22f2abf15450087dc44b307
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:48:48 +0800
Tag:    v2.6.0-beta

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

commit a93db2885006f5468fc43b7e87f561db5ad76664
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:46:07 +0800
Tag:    v2.6.0-beta

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

commit cf13da65e1c868eb8d1f65728fe5cde93db56958
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:13:41 +0800
Tag:    v2.6.0-beta

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

commit 0d5c80e2980715295f098765b16a4d0ae294c19e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:48:20 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41662_master' of https://github.com/totara/openbadges

commit f534464a060f5bf0cd5c46284edbe1fad503c671
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:47:47 +0800
Tag:    v2.5.3

Merge branch 'MDL-41662_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 9034f94d0748b00082ac33b870f3f73e5fc16f3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:42:47 +0800
Tag:    v2.6.0-beta

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

commit f8eaa73b4195591d80ae42ff0a20c09663f6d766
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:38:34 +0800
Tag:    v2.5.3

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

commit 1081b8ec84d1579ad09488130d50e16bfa60a8c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:38:25 +0800
Tag:    v2.4.7

Merge branch 'm24_MDL-37524' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit df1d3e911527eb797c61e5ad3a34d7c629e600fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:27:16 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-27684-master' of git://github.com/satrun77/moodle

commit 10c3f9e7e8b155db30f46bbd7eee52b09c331a17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:27:01 +0800
Tag:    v2.5.3

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

commit af0a06b521b32ea21a540dbc222d265cb9ca0e4d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:26:50 +0800
Tag:    v2.4.7

Merge branch 'wip-MDL-27684-MOODLE_24_STABLE' of git://github.com/satrun77/moodle into MOODLE_24_STABLE

commit 7c76607aaa21c5e5e7d8394b77162d2f2eec35c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:13:17 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-29987' of https://github.com/bostelm/moodle

commit d7b20f165033dca1ca975e5983d967aee41fd857
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:12:51 +0800
Tag:    v2.4.7

Merge branch 'MDL-29987_24' of https://github.com/bostelm/moodle into MOODLE_24_STABLE

commit 694cb9b053ece1ff0c52a1e1b8f6d21f49fbe540
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 05:40:00 +0800
Tag:    v2.4.7

Merge branch 'MDL-41534-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 6b909c759d72a815167493d3fcf6ff1971b092e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 06:50:08 +0800
Tag:    v2.6.0-beta

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

commit 8377c04acfcb41a7f34249468ddbf7eddbfa358d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 06:49:53 +0800
Tag:    v2.5.3

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

commit 214816fb191055681005a03b7a4a259d32fceebc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 06:13:29 +0800
Tag:    v2.6.0-beta

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

commit b3602b3e5e4e85e7fd77d45810ef0ea4752252f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:47:41 +0800
Tag:    v2.6.0-beta

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

commit 2ecaec9bb6e37c463cc36fdf452dde41dee3d70c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:42:40 +0800
Tag:    v2.6.0-beta

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

commit 884d1b2a41de3baae09c8c3c61cfb834b2afe508
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:42:25 +0800
Tag:    v2.5.3

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

commit 3b2c61fdb82c369cb65061903780276a02deb7b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:42:14 +0800
Tag:    v2.4.7

Merge branch 'MDL-41658_M24' of git://github.com/kordan/moodle into MOODLE_24_STABLE

commit bf6181d451daab9a13ab620c9fa15be1c1d63582
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:39:13 +0800
Tag:    v2.6.0-beta

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

commit 67c52739d3dd10b2ec0ed8d22a2a2f1da2e34a0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:32:33 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41634-url-download-warning' of https://github.com/mnoorenberghe/moodle

commit 087bc6ba67d1266631f58ab9be36df3d007459fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:28:42 +0800
Tag:    v2.6.0-beta

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

commit ba5d7f8b1cb522fdec316397204b346295fc86fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:26:44 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41528_master' of https://github.com/nitzo/moodle

commit 7952a767a31e87f0caf50ad1454b2d6a1d461240
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:26:21 +0800
Tag:    v2.5.3

Merge branch 'MDL-41528_MOODLE_25_STABLE' of https://github.com/nitzo/moodle into MOODLE_25_STABLE

commit c88b113c1ffae6bd11f8d270a7f2b6b148a175ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:26:02 +0800
Tag:    v2.4.7

Merge branch 'MDL-41528_MOODLE_24_STABLE' of https://github.com/nitzo/moodle into MOODLE_24_STABLE

commit f773cb2e9424bb5366e139e1404c8db99c8de62f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:20:53 +0800
Tag:    v2.6.0-beta

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

commit eb398c5ce60310c7085e5fc04238e65eade6f43d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:20:39 +0800
Tag:    v2.5.3

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

commit aa6699f4db37d2934c5c57a539138f4eb4b95fb9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:20:27 +0800
Tag:    v2.4.7

Merge branch 'MDL-41630-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit cde5c4a58eb0016eb885f8886e3805c959ab9b38
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:12:32 +0800
Tag:    v2.6.0-beta

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

commit 3623d74adc61ef6b0eb3f584f66ed35131fa44d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:00:54 +0800
Tag:    v2.6.0-beta

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

commit 89c92427ad4c8d4939ccb45c046499ec96bee4c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:00:23 +0800
Tag:    v2.5.3

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

commit 994009ddfecff888ffb6c1719348278e72e62859
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:54:26 +0800
Tag:    v2.6.0-beta

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

commit 33636b404001815735716b3b0ff41992e70d0969
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:52:52 +0800
Tag:    v2.6.0-beta

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

commit c26684b2bed47cc99d56f6e7d2dd47856826b7f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:52:38 +0800
Tag:    v2.5.3

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

commit f605403fe22915558e54add6c8ce3b442bd0f865
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:51:02 +0800
Tag:    v2.6.0-beta

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

commit 492351897d501dff688a094d239eb9228e845f30
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:50:50 +0800
Tag:    v2.5.3

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

commit 79257da228e7fd77af29065a061a3b6a12689f93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:45:22 +0800
Tag:    v2.6.0-beta

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

commit c4f5f0ee597758530d58e00e3a65fc4973f7aca0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:42:37 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40471_master' of https://github.com/totara/openbadges

commit e0a8b60f5dc706afc42c23f239b38c3a451eafbf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:36:54 +0800
Tag:    v2.6.0-beta

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

commit c02045ddc4b8cd0ae3af6a7800971f84b64963c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:34:58 +0800
Tag:    v2.6.0-beta

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

commit c0382dd012d7c080a19a66c17b6e89182f8db8e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 11:44:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle

commit cb7ca00c55ee5be44063a0db5cdc45cd3607fcb9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 09:12:13 +0800
Tag:    v2.6.0-beta

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

commit 3f6c2f7de8a69b02af61670b6b0d6cd450c8c973
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 09:11:54 +0800
Tag:    v2.5.3

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

commit b14d0e47131223bc0a16c526267a6db2f8469220
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 09:11:21 +0800
Tag:    v2.4.7

Merge branch 'MDL-41600_24' of git://github.com/aolley/moodle into MOODLE_24_STABLE

commit a63d1e2871541ce14c640d6bc3b03e205095c0d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 09:07:37 +0800
Tag:    v2.6.0-beta

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

commit a775f2c96dbb00bdb2e3fa2625fcb348f9b64bb1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 07:22:04 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle

commit bee0a508ef4d1ac41bcdc3d7cf0564244c8ae82e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 07:16:30 +0800
Tag:    v2.6.0-beta

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

commit 68d3e7682ad51765b8918e4b0eb96f3a83eb5d43
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 06:31:59 +0800
Tag:    v2.6.0-beta

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

commit 12d50d8216f7b7797d5d49e1576b0c989acd715f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:38:46 +0800
Tag:    v2.6.0-beta

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

commit 7eb3ddf9b5cabb95c324ea5e996eefa858df02f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:38:35 +0800
Tag:    v2.5.3

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

commit 5db72d63c567eef6c28fdb233ccdac88929111f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:38:23 +0800
Tag:    v2.4.7

Merge branch 'wip-MDL-32862-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE

commit 9b6415dd38a6e6e4f74aa280cdcaea2be46b29f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:36:24 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle

commit eb52eb1df073f030f3b92b488d726b6db3971ce7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:35:59 +0800
Tag:    v2.5.3

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

commit d58d0239db1155d0bd588a4838db9ec972d18697
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:35:50 +0800
Tag:    v2.4.7

Merge branch 'MDL-29378-survey-24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit 33909ed001aa1891b7dd6046eda5beb4cfd75414
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 07:12:56 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38794' of https://github.com/prateeksachan/moodle

commit 119bc4adfc86a38d27006c86c350472c3927bc69
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 07:12:23 +0800
Tag:    v2.5.3

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

commit eae5890112e2dc500ac86542abf79c3a9b26764f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 07:12:11 +0800
Tag:    v2.4.7

Merge branch 'MDL-38794_24' of https://github.com/prateeksachan/moodle into MOODLE_24_STABLE

commit 771080ba7d113039be0b83af3adeb2d069db070f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:54:11 +0800
Tag:    v2.6.0-beta

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

commit 9691b405fc738ae2757cf993ba55179a9e1812b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:51:07 +0800
Tag:    v2.5.3

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

commit fd9ecb595f620bdc19c099175e48f52a71b09e17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:50:56 +0800
Tag:    v2.4.7

Merge branch 'MDL-41417_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 1fdc20cbdbebb1d49414dedd8f0954408546a0fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:48:49 +0800
Tag:    v2.4.7

Merge branch 'MDL-29378-survey-24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit efe6343ee0bdc124094b1c68817f16a59b1844d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:48:37 +0800
Tag:    v2.5.3

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

commit fb76f7492e59d02e1447c9c1698f46e88830165d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:48:13 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle

commit 58cc269d0c55c5cb6a80b60cd527986d735a094a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:19:00 +0800
Tag:    v2.6.0-beta

Merge branch 'w37_MDL-28094_m26_subdirs' of https://github.com/skodak/moodle

commit 0b7a2b7bec7fe778fc5d7895220c5ebc4102dbca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 04:58:44 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41460-master' of https://github.com/FMCorz/moodle

commit c1613ed53ad966510884d51043f2dee138d6e682
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 09:17:37 +0800
Tag:    v2.6.0-beta

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

commit 5cdbdc4a7171d803592c6ad7ba66bc50cd2747ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 09:13:18 +0800
Tag:    v2.5.2

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

commit 2968602ccbf1eddb54107ee8152ea432d82912d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 08:13:34 +0800
Tag:    v2.6.0-beta

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

commit 34884b3ec8950f5476d38adf939bc4bfa881b5ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 08:13:06 +0800
Tag:    v2.5.2

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

commit 4bc9eec96f8ea0ecc51ab83d8a433ef12e36ad96
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 08:12:43 +0800
Tag:    v2.4.6

Merge branch 'MDL-41162_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 6eee89bc8f73ef59ba7b837fbdc3ebb2c51436f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 08:08:46 +0800
Tag:    v2.6.0-beta

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

commit 1ef7722cba32b19c903edbb45dc33aa6f1875c6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 07:01:51 +0800
Tag:    v2.6.0-beta

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

commit aee98acb92a5d138a395e1e611c706f4478fee11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:59:54 +0800
Tag:    v2.5.2

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

commit fef821d726a9cd18cd9fdba7b8386b2ee1edfc31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:59:34 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-41144' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit b89fbc461555d1d7ec58249681e6280eac7baa72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:56:00 +0800
Tag:    v2.6.0-beta

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

commit ead9cce340cb90536b21f5e0388c67400ea602f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:48:02 +0800
Tag:    v2.6.0-beta

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

commit 8afa842c60380e05484da760bd2244cc21b8770b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:34:21 +0800
Tag:    v2.5.2

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

commit 69127087c928d4c74f3cfaa19460201f94314f54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:33:30 +0800
Tag:    v2.4.6

Merge branch 'MDL-41157-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit cc76e82d5862224e9f2b8fbb42b889a5292e470e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:21:04 +0800
Tag:    v2.6.0-beta

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

commit 0eb65affd29ed17e05a2c5554893f420c5b97d4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:09:08 +0800
Tag:    v2.6.0-beta

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

commit c5bba2fc2df9b485e5b4e98fa97498700c9f59e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 05:59:19 +0800
Tag:    v2.6.0-beta

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

commit 93564564e471a658e3da1486a2fa78cad029595b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 05:56:16 +0800
Tag:    v2.6.0-beta

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

commit 6ef239f1c83af0835bc5e9a3495cde25bfb079ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 05:30:14 +0800
Tag:    v2.5.2

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

commit b43863f6a98fe55f04d9e8131590d5f9d73f0692
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 05:29:31 +0800
Tag:    v2.4.6

Merge branch 'MDL-41196-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit d333a3f2da666042e7dd8eeca41145e5e915cc1b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 15 Aug 2013 11:16:19 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41200' of https://github.com/rwijaya/moodle

commit 0b7e4a1474f30651f88f4623e52c6d551077c3ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Aug 2013 05:15:00 +0800
Tag:    v2.6.0-beta

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

commit 969de2a200e7c162508209b097f78b46fbe5789c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 10:13:13 +0800
Tag:    v2.6.0-beta

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

commit c0dfd035c4b0f6c563a55b5fcc0b4f49fd67712b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:49:12 +0800
Tag:    v2.6.0-beta

Merge branch 'wip_MDL-40077' of https://github.com/jamiepratt/moodle

commit 0c0efd71a1bc2c889a039468dd42cbd637dc7cb6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:26:26 +0800
Tag:    v2.6.0-beta

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

commit 615cf2d15a287c79ba5ff5b868de4d37b4a1f8a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:19:34 +0800
Tag:    v2.6.0-beta

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

commit 3f1c01de8d204296bce33bced061e99c3016d1ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:19:16 +0800
Tag:    v2.5.2

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

commit c7f4deecbda86ae6d2e6ff210f67f005dd131cff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:19:05 +0800
Tag:    v2.4.6

Merge branch 'MDL-41045-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 49c7794dcf9866d543c2b6bc09d9cf28e26e53a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:16:14 +0800
Tag:    v2.6.0-beta

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

commit 717d68544d4291d40a8de807d346d284f334974d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:46:17 +0800
Tag:    v2.6.0-beta

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

commit acf6a06d5ed1c7e375b35356b077b85f8028badd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:45:03 +0800
Tag:    v2.6.0-beta

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

commit 0ade13532ba91fcebd187c460221a82d70af00e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:41:27 +0800
Tag:    v2.6.0-beta

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

commit 7ccc8e8b1c52c7c3fb98312afeb09d5b123cf99a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:41:10 +0800
Tag:    v2.5.2

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

commit 0047905f9148d745cc2a0e8344cbcaf00373c169
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:40:59 +0800
Tag:    v2.4.6

Merge branch 'MDL-39691_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE

commit defb89c30c8f25e26a39ea7789aaf01cf8f7b562
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:38:40 +0800
Tag:    v2.6.0-beta

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

commit acea87e9b2999e8c82817ffafb7ecb410ebcc17f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:38:29 +0800
Tag:    v2.5.2

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

commit 452ff2528432a38dea3c2f994d6531cd526ea347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:38:20 +0800
Tag:    v2.4.6

Merge branch 'MDL-41091_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 90fb4f39fd530e997488152449483834dbae2225
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:37:02 +0800
Tag:    v2.6.0-beta

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

commit 6648f17384969436349d78d7ae291c0072568e20
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:32:48 +0800
Tag:    v2.6.0-beta

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

commit 05c04ad471a764be3aea8c20b573ae7401d62432
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:31:43 +0800
Tag:    v2.5.2

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

commit bbf434b6396a1dcff1181725a5945c52e8061a5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:27:50 +0800
Tag:    v2.6.0-beta

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

commit 23b7f1dfcfb29ac85c4bf6249cd3dbe43ca3384b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:24:12 +0800
Tag:    v2.6.0-beta

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

commit 6ae19630c5a0db8d1235323cea7c04cf8a8a8f03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:22:44 +0800
Tag:    v2.5.2

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

commit 3155dcf5414d2eb103f1862611e7432f2cc1383c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:21:40 +0800
Tag:    v2.4.6

Merge branch 'MDL-41033_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 61f2c458d59080bbac44671f59f6daf0244a1b25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:12:24 +0800
Tag:    v2.6.0-beta

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

commit 41b0597855de58bfa4932469b7d520beb0d2e60f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:10:28 +0800
Tag:    v2.6.0-beta

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

commit 19f92cfd80bd54bafb8d709645ff70030b2ea005
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:09:59 +0800
Tag:    v2.5.2

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

commit 761b48df5912e479151ad3530bb4dace822d1daa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:08:15 +0800
Tag:    v2.6.0-beta

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

commit 8e086c697ea044a36ab49aed96611d3c08c63f3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:08:04 +0800
Tag:    v2.5.2

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

commit 06737a22ea5fc31947e4348c8995b4c5619a8718
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:07:49 +0800
Tag:    v2.4.6

Merge branch 'MDL-40996_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit cd0103fa6043983ee9084a223903411e15615224
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:03:45 +0800
Tag:    v2.6.0-beta

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

commit f37d53296df4b5f7dd764ae1a8c188a2198ba089
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:57:15 +0800
Tag:    v2.6.0-beta

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

commit 1e6ac6957e920fcdcc5dc07d5402e33be4a4e79a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:45:43 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-30895-master' of https://github.com/mouneyrac/moodle

commit 2f1dbeb9bac02a2fe4eb3e7d7b683c078ebe4613
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:45:25 +0800
Tag:    v2.5.2

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

commit c5dd64f1e9d82b175b10832219cc0cdf5472957e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:45:13 +0800
Tag:    v2.4.6

Merge branch 'MDL-30895-24' of https://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit 8fa5ad621224573063afb8418f6ea9a95bb6b629
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:38:33 +0800
Tag:    v2.6.0-beta

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

commit 5c46191bd0b5da7b76b60041fa357517df4eca2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:38:20 +0800
Tag:    v2.5.2

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

commit c41a6dfcd35b020e58f305fa2213404c4e25e091
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:37:59 +0800
Tag:    v2.4.6

Merge branch 'MDL-35931-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 97907a85f103d2cbf9775906d93cc445da011d49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:36:01 +0800
Tag:    v2.6.0-beta

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

commit 55ad6e58419957aa3fdd85af172b0c6d8385ff2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:35:34 +0800
Tag:    v2.5.2

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

commit 869a5896d05d127b9524cd0aa952e6ea4afaef9b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:35:23 +0800
Tag:    v2.4.6

Merge branch 'MDL-35919-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 8e9709f8bfb4bd62f52ff6eaee67015b679268bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:33:12 +0800
Tag:    v2.6.0-beta

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

commit 2f4aa72775b6561d3c507845f9de823fc098d49c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:32:43 +0800
Tag:    v2.5.2

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

commit f568a40ac733d972508c37a789d3d28b99b88720
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:31:59 +0800
Tag:    v2.4.6

Merge branch 'MDL-35934_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit d3fb29877edd41c35703958d845382043964f5f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 10:23:10 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41086_m26_upgradecheck' of https://github.com/skodak/moodle

commit 63106eae7fa30cc80512b269c663b44b82f65886
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 10:03:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41073_m26_needsupgrade' of https://github.com/skodak/moodle

commit 8b7378cff02d6a9717f54bb57691db8cb2e957ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 08:11:07 +0800
Tag:    v2.6.0-beta

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

commit 61bec33f53704994cb750d65ba48ebf0bc381418
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 07:02:48 +0800
Tag:    v2.6.0-beta

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

commit 45f133884e7297a61dd6a1ac2ac920f11033951a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 06:38:06 +0800
Tag:    v2.6.0-beta

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

commit 9ce818b6d712bb46cc653acd96bec9dc2a90e9a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Aug 2013 12:19:55 +0800
Tag:    v2.3.9

Merge branch 'install_23_STABLE' of git://git.moodle.org/moodle-install into MOODLE_23_STABLE

commit a6e4a83d9977edd5de01490cda05c17f8134c3f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Aug 2013 12:19:42 +0800
Tag:    v2.4.6

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit 7ff9696fcb536fb05f3dca3fd903c16fd24f7c74
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Aug 2013 12:19:30 +0800
Tag:    v2.5.2

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

commit ec94685c4d5392564cb3be0f4aceaf54be75fd48
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Aug 2013 12:19:12 +0800
Tag:    v2.6.0-beta

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

commit f05ea82cdc82baf85f1b6d99556a167aa0da32aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 11:19:49 +0800
Tag:    v2.6.0-beta

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

commit d4519366f4dd66400dc524acaa1df32670c2611e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 10:01:51 +0800
Tag:    v2.6.0-beta

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

commit 823c0c80e9f35843fffc72593b5ab7ac3f724915
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 06:39:40 +0800
Tag:    v2.6.0-beta

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

commit 7478d2534b6546e04bbc1426b51c6a4ae42e311c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 06:37:34 +0800
Tag:    v2.5.2

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

commit b6a2a20236c3da0705b5abb284a63a05fc274856
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 06:36:55 +0800
Tag:    v2.4.6

Merge branch 'MDL-40086-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 774b1089a583ab0cfb1a42f021b9c18b28f4bf65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 06:23:32 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40438_m26_textlib' of https://github.com/skodak/moodle

commit 36671670e117ee487d7c19fb545bb06acd4c9878
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:51:30 +0800
Tag:    v2.6.0-beta

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

commit 3267d961326894453c1d2540c2e6b7873cf412f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:51:17 +0800
Tag:    v2.5.2

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

commit b19a900a9b08840ce303a611909308208b7b4be1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:51:06 +0800
Tag:    v2.4.6

Merge branch 'MDL-34989-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit d2132f02e2adfd67a0d2efd617fff1d3c0e0fab9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:45:16 +0800
Tag:    v2.6.0-beta

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

commit 9c83b82b1b95a1aa943a2a164e2a381ca8a8af26
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:39:41 +0800
Tag:    v2.6.0-beta

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

commit 2ad4a763ab052e6fcef19eaa7814e2f1a63d1aa8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:36:33 +0800
Tag:    v2.6.0-beta

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

commit aca4d181b982b3fe1b6ab0a99fecbbb1aec02741
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:36:08 +0800
Tag:    v2.5.2

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

commit 206f18c836b95006802b88cd5bb27b5bb453c365
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:31:14 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40420' of https://github.com/prateeksachan/moodle

commit 0b1ee3b87177f384f13678aee8c99c7a0944285c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:01:55 +0800
Tag:    v2.5.2

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

commit 5261f26e0e61be1bfb267f1405603205d15016ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 12:55:48 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-41002_m26_enroltypo' of https://github.com/skodak/moodle

commit ce3fe87f9174e349cf897a537221e7b0297349fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 12:55:31 +0800
Tag:    v2.5.2

Merge branch 'w32_MDL-41002_m25_enroltypo' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 1d92024f99f999d98932c26239b49494706c021e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 11:50:18 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-41020_m26_umaskpermissionsnotice' of https://github.com/skodak/moodle

commit 17440b21980643f4a4be3f4fae3f667ec1fa42a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 11:38:18 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40815_m26_deprevent' of https://github.com/skodak/moodle

commit 68736bd623f3586286792e641d37e0a07350efb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:47:38 +0800
Tag:    v2.6.0-beta

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

commit c3aefeb5a6a1667b4c7ed7383e7312c7c39855ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:39:49 +0800
Tag:    v2.6.0-beta

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

commit d3751ed482b6bc8b8572e1e252c69aea78106a46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:39:29 +0800
Tag:    v2.5.2

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

commit 504dc600482e21e021226e507b07513038d231b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:39:15 +0800
Tag:    v2.4.6

Merge branch 'MDL-40662_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit e145762b172995bfe61099d4f32e29ec0e7b4723
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:37:43 +0800
Tag:    v2.6.0-beta

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

commit 471dd4ff67427f094cb88aa45839c077868bc3f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 09:59:23 +0800
Tag:    v2.6.0-beta

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

commit fe33106bb1f7c23d58f4bfda1519264747d88133
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 08:49:28 +0800
Tag:    v2.6.0-beta

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

commit 468ee9863d8e61129b891907199d5c1c733aae28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 08:45:20 +0800
Tag:    v2.6.0-beta

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

commit c7c020aad2836f6d2e99a3da41fff5a067babbf2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 06:23:45 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39090_lti_dup_params' of https://github.com/moodlerooms/moodle

commit 911b271215f916690889cdd2d119958b15bef8f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 06:11:20 +0800
Tag:    v2.6.0-beta

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

commit a2f561b6a7401bd3d1748235a3465d80a58dbf1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 06:10:46 +0800
Tag:    v2.5.2

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

commit ecd106d68dc35912f859c08f9adcb04b79b76638
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 06:08:39 +0800
Tag:    v2.4.6

Merge branch 'MDL-27953_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit eeb784d41d7bee8c91d52f2bc99dec55b4698e25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 05:55:10 +0800
Tag:    v2.5.2

Merge branch 'w32_MDL-40889_m25_jsminify' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 1498e8548315cdc5ce0fda6dec2404aa8b9e9906
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 05:54:48 +0800
Tag:    v2.4.6

Merge branch 'w32_MDL-40889_m24_jsminify' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit b09abb05abd87b78c2361bb797a6026cfaba74a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 04:53:24 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40901_m26_phpunitcleanup2' of https://github.com/skodak/moodle

commit 1eebbc28543823b9818e8c4fecafb431b3fad44f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 04:49:28 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40943_m26_observers' of https://github.com/skodak/moodle

commit 6aed99dd0a5298edb37b43b81eebc3e1f201e3b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:46:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40937_assignment_history' of git://github.com/davosmith/moodle

commit 85180a0fa925704f0bd1f5181ba973c08e8afb67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:46:44 +0800
Tag:    v2.5.2

Merge branch 'MDL-40937_assignment_history_25' of git://github.com/davosmith/moodle into MOODLE_25_STABLE

commit 2c5c56e974a1de3564b729c2b065df80ccb3dd1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:37:37 +0800
Tag:    v2.6.0-beta

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

commit 737542c6741f00fd3a25803b56c139ec640d833a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:37:14 +0800
Tag:    v2.5.2

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

commit 176a60227d0fc9831663c76165e0a62b919e64da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:33:09 +0800
Tag:    v2.6.0-beta

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

commit f16972e717682955fb7fdb1c0a9c8484efc5b5e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:32:12 +0800
Tag:    v2.5.2

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

commit 86ebf30fcf38cdca2987d1f5e607bec84f84be13
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:31:59 +0800
Tag:    v2.4.6

Merge branch 'MDL-35922-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 4c7f0562d07c6d81ec28cf0aacd5cfd8392ddbde
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:38:47 +0800
Tag:    v2.6.0-beta

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

commit 9f15b383d16342517b17432f5a6a4cedb15b7df4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:38:38 +0800
Tag:    v2.5.2

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

commit 9d146cf08a6f0b5c6e3296b6a04c932c1f263297
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:38:31 +0800
Tag:    v2.4.6

Merge branch 'MDL-35927_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 2b80bb33dfa3d309f3f0df6c226760eeefa9f86c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:15:27 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40995_m26_minifyreworked' of https://github.com/skodak/moodle

commit 335fcfa4f91432616a884decaac9f779b6d460d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:06:26 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-41017_m26_purifier' of https://github.com/skodak/moodle

commit 324b489bdba84f35586ae8c908301a6857ead99f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 09:36:56 +0800
Tag:    v2.6.0-beta

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

commit 03c3e7c4e841efee2e3cc878bbaa50137135c292
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 09:36:43 +0800
Tag:    v2.5.2

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

commit 1496e4990fee8be8b66f23f5cd9b1ffdf16c9e05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 02 Aug 2013 04:12:26 +0800
Tag:    v2.5.2

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

commit 0460f175d23ba88cd667e4817118b4da1fead10f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 02 Aug 2013 04:12:13 +0800
Tag:    v2.4.6

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit 8dbc9cf753d4ac7df120feaba788ad3f862fa848
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 02 Aug 2013 04:12:00 +0800
Tag:    v2.3.9

Merge branch 'install_23_STABLE' of git://git.moodle.org/moodle-install into MOODLE_23_STABLE

commit b3db9ddaf88eb06fed12475294ea9ccdcab09246
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 02 Aug 2013 04:11:35 +0800
Tag:    v2.6.0-beta

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

commit 4a4d57ae1fa5cd974b78fc8ad27a99bae9d6dc81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Aug 2013 05:47:57 +0800
Tag:    v2.6.0-beta

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

commit 6867a78d7513076ed5bdb061b6544882f8baa519
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Jul 2013 05:11:22 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-39430_m26_opcache' of https://github.com/skodak/moodle

commit 56c3e4762f555c11b6ec172742e85d0e6415e60d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 06:36:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40902_master' of https://github.com/nadavkav/moodle

commit c6457b8acf686ea20ac9b8462d6abdbf744e2556
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 06:21:38 +0800
Tag:    v2.6.0-beta

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

commit 4960ca0738b7b75301312b6f7a58c217438a7a90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 06:19:41 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-39915_m26_tests' of https://github.com/skodak/moodle

commit a2d847842e244da15582fe04ce2d67278f5ed3ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 05:40:40 +0800
Tag:    v2.6.0-beta

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

commit cecc076eb75b832d6687feee0ce6f72fc989891d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 05:40:28 +0800
Tag:    v2.5.2

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

commit 816f873068b6ca7851942ef814f1d2c2ff842465
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 05:39:03 +0800
Tag:    v2.6.0-beta

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

commit 867eba7641069d0aa9f6bd509e16f910ff0cc6ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 05:33:56 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-39786_m26_metarole' of https://github.com/skodak/moodle

commit 6cef3dfe8eabb257034bea8d27b416c383a2dc3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:59:58 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39461_dev' of https://github.com/totara/openbadges

commit a38830a07b9ce95043ab005872ff99e84d57e47d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:59:26 +0800
Tag:    v2.5.2

Merge branch 'MDL-39461_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 0d33dbd9b87a77d397c6e5c53e4a4319a552e4e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:58:14 +0800
Tag:    v2.6.0-beta

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

commit 73b4c1da844fcff99c8c21a54a8d05b0dc95d82d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:55:35 +0800
Tag:    v2.6.0-beta

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

commit fb947a424a86384795709ff2dc93f9f0c6b34723
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:47:34 +0800
Tag:    v2.6.0-beta

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

commit 84522488819a4eacbc15612fa9db1c897ca649c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 09:05:07 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-11270_m26_nvarcharmax' of https://github.com/skodak/moodle

commit 1091c534450a83862485aab8d2968f7bd5e2e310
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 08:54:31 +0800
Tag:    v2.6.0-beta

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

commit 5fb1fad943d03ed9d99a96c8ff491203f70513cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 08:54:16 +0800
Tag:    v2.5.2

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

commit 683fbbb8d705e6df77d61d5c90d39ccc236ff39b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 08:54:07 +0800
Tag:    v2.4.6

Merge branch 'MDL-40878_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 609bda269ed2e3d3b79526d65015c47e47b3e9b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:53:02 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-40891_m26_mkdirrace' of https://github.com/skodak/moodle

commit 7b3a806741fb6dbb3250f422360ce47adaad6286
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:52:35 +0800
Tag:    v2.5.2

Merge branch 'w31_MDL-40891_m25_mkdirrace' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 682f6d57cd1b25087f2dc772a6ee2e46bd54ced2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:52:14 +0800
Tag:    v2.4.6

Merge branch 'w31_MDL-40891_m24_mkdirrace' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit fa198e6346bdf9174524f3350b9e6e9eb01be5a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:50:00 +0800
Tag:    v2.6.0-beta

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

commit 8ba4fd3b9a89b4c6c74cde1af74d76b2d7fc67fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:49:41 +0800
Tag:    v2.5.2

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

commit dacf5b62e8a8b4f41b5589e6871bcbbe7b23d2a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:48:15 +0800
Tag:    v2.4.6

Merge branch 'MDL-40727-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit db5ee815762a9abf3caf6c75457608730dc3be7b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:01:57 +0800
Tag:    v2.6.0-beta

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

commit fa386d3e366119126aece3cba5e26fd570054fb8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:01:45 +0800
Tag:    v2.5.2

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

commit aa713f26bdbf763aa688aa5a6b7f7c032448ff67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:01:33 +0800
Tag:    v2.4.6

Merge branch 'MDL-40854_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit cfafbd1270c0f21b1e9622a377250a902cacc15d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 06:53:05 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40005_lti_headers' of git://github.com/moodlerooms/moodle

commit 6269efd29b84d6c54c2f08140f17e50d3c464b96
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 06:49:40 +0800
Tag:    v2.6.0-beta

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

commit feb34ff4e87ffb342e435ea9aeaa6aff7d5cea7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 15:19:47 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-23493_m26_fonts' of https://github.com/skodak/moodle

commit 904c38b31deb41ff22a923f54d999d455395d5a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 07:28:26 +0800
Tag:    v2.6.0-beta

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

commit 7de495d5c6f622f4445bd70d176d6015ba2c815b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 07:27:58 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-37869-stable25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit d853f819dcb014c803f567ab1928517cba395954
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 07:14:14 +0800
Tag:    v2.6.0-beta

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

commit 5590ac2aff903f57ca8c02342707b4bbcca84382
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 07:14:01 +0800
Tag:    v2.5.2

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

commit deeae9c1553e62d227c9fd1dd3b0776ce405de82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 10:14:27 +0800
Tag:    v2.6.0-beta

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

commit 63ddd040c0d1debf49ea3d58cf23a86fd256a936
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 10:13:59 +0800
Tag:    v2.5.2

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

commit 1f3be767084950a8e92f2d8afd85fb268997085c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 10:12:35 +0800
Tag:    v2.4.6

Merge branch 'MDL-40680-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 18474f822b196e9e5af1b924a5253293897f41b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 10:09:08 +0800
Tag:    v2.6.0-beta

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

commit 97ff2341b37cd57f16a716c2bd50221c0354e03c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 09:59:16 +0800
Tag:    v2.6.0-beta

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

commit 07724a9ceee993bbcc805b65990d74e0d70bd9c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 08:00:59 +0800
Tag:    v2.6.0-beta

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

commit 031ef3f871e452bdbfc3ece5fb2c67a522aae92d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:57:50 +0800
Tag:    v2.6.0-beta

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

commit 092a99ef08c4d2920e030b80338c481a3aae56d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:12:39 +0800
Tag:    v2.6.0-beta

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

commit d0ed9d6375812548a7f0d6500e8bd43b6dd3258b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:12:34 +0800
Tag:    v2.6.0-beta

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

commit 374f7b1d287d6edc0487066f2ad02269987a1eca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:07:53 +0800
Tag:    v2.6.0-beta

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

commit 0ad4bcd102d8311738c344615c1425f2de9e8052
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:06:08 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle

commit 6426d2d26433dfb83d12629deb7644beacc9bb39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 08:19:05 +0800
Tag:    v2.6.0-beta

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

commit 70e9700195a01da1eb6414c142da6ef306d40207
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 08:18:36 +0800
Tag:    v2.5.2

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

commit 93b4d2658a97d2a74d857bf08802dbd8c7e33c14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 07:07:00 +0800
Tag:    v2.6.0-beta

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

commit 1be1f6be53d9e877b92a97dd52dd64519f0da728
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 07:02:21 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40450_m26_tinymcebuttons' of https://github.com/skodak/moodle

commit c001e046e04e6cdddab5643060970d1da1297f9f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 07:02:01 +0800
Tag:    v2.5.2

Merge branch 'w28_MDL-40450_m25_tinymcebuttons' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 286232d695871f266afe019b494452c7045090ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 07:01:48 +0800
Tag:    v2.4.6

Merge branch 'w28_MDL-40450_m24_tinymcebuttons' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit ccae3a612d2c2b2ac396e8e7ef9b293698c4e7b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:43:28 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40537_m26_majorupgrade' of https://github.com/skodak/moodle

commit 4e6ad78679bcc70bf88f1ad3cc238fc6c0fe7e10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:35:18 +0800
Tag:    v2.6.0-beta

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

commit a8402cc115c6dbdae78612eba50130f3ed10f46f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:31:39 +0800
Tag:    v2.6.0-beta

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

commit 7c6e64c36cbd72b51ffcbf4c162bd5667d5ba279
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:31:25 +0800
Tag:    v2.5.2

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

commit 97d98e9920ad387c23e4d3bc6285045797bf5d42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:30:29 +0800
Tag:    v2.4.6

Merge branch 'MDL-40527_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit a4fd82ac754b0939da0cadbabe371fa86287746a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:19:13 +0800
Tag:    v2.6.0-beta

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

commit 33ed6a9d94260bb4836ec4367a16f145ab26b611
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:12:44 +0800
Tag:    v2.6.0-beta

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

commit 05fb99ac705c0a0a4155417fd914d6b98470e604
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:10:11 +0800
Tag:    v2.6.0-beta

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

commit c6b546a1ee58c1878b2eddaca84df1ea784a4a9b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:09:59 +0800
Tag:    v2.5.2

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

commit 3b0c725de11d8758d8bc3ec920fdefe559a4fd24
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:09:49 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-40512' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit fc7e5a031edd32fa8a0d44d898da568d54a5e2e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 05:54:38 +0800
Tag:    v2.6.0-beta

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

commit 59cd82f9b7597706d7988de68b7ec61142bb965c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 05:51:15 +0800
Tag:    v2.6.0-beta

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

commit a13ee8e18a139ffdd44bdc482777125ae2f53a62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Jul 2013 10:42:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40402-master2' of git://github.com/ankitagarwal/moodle

commit 93b2977d9d9cf103218c5f0afde705911aa3a2ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Jul 2013 06:31:48 +0800
Tag:    v2.6.0-beta

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

commit f0d974fb28d8ddeb77663eb2d25886930608a9ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Jul 2013 06:31:28 +0800
Tag:    v2.5.1

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

commit 6ee9989d259ebb0272853c963631d53830527843
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:48:05 +0800
Tag:    v2.6.0-beta

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

commit ebc9b6d15833c40d4fa3aded8c7e4686765d0fd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:47:50 +0800
Tag:    v2.5.1

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

commit e962fe0871715aff48a1b4a11e3ca390755a0d6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:22:27 +0800
Tag:    v2.6.0-beta

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

commit d20391916c7a464a47aa5d6bbff48d824b503b65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:17:48 +0800
Tag:    v2.5.1

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

commit 88abda50aabcc798a0fdaf00e2b6ba8388c6807f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:08:31 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-35206-email-links' of git://github.com/mudrd8mz/moodle

commit 9a561bc5a1430f11bb68ac6bae4888863c61b82a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:08:15 +0800
Tag:    v2.5.1

Merge branch 'MDL-35206-email-links_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 4eba7399ad6bbfd78aa024859d29d12b4b16efc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 08:19:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40305_m26_phpunitloader' of https://github.com/skodak/moodle

commit 49eef7d82d7366c180903ab2a95fb8f3511a7527
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 07:35:57 +0800
Tag:    v2.6.0-beta

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

commit a1d472d8c60afc8932b4c2099038a10ee0393831
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 06:59:29 +0800
Tag:    v2.6.0-beta

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

commit 10a741cc64cc9778d4e7dc18508c2f77446dfc5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:59:24 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40065-master_4' of git://github.com/gjb2048/moodle

commit 6e07abb32dbe4d11a6267e622a2d16621cf5fb9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:58:44 +0800
Tag:    v2.5.1

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

commit cbc4b33afdb3f5910a2445c06e72f7d3df81448d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:13:16 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40289_m26_badgescaps' of git://github.com/skodak/moodle

commit bc0227d3e5a1145225f5df45324e6b302befa21f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:13:05 +0800
Tag:    v2.5.1

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

commit c7b6c86a49a3a01424362e435bc1df256518be7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:43:19 +0800
Tag:    v2.6.0-beta

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

commit 4418496864cab6ddc3a9d73e21d0cab45c54cc91
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:41:24 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39044-stable25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 109a2ff00e5c2c55854d4ba430a387759c368e93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:15:01 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle

commit 82125f7a78b29f50f58995a31050d3502f522cdf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:07:14 +0800
Tag:    v2.5.1

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

commit 4ba45e3955ffc0479f8365df076c64a2d87b0d47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:43:00 +0800
Tag:    v2.6.0-beta

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

commit 9e5adb930599c9b4a1f6dea27f8b2010863e4215
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:33:04 +0800
Tag:    v2.5.1

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

commit 7bb2a9586e87395bb56a9fdf2198631d960240ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:30:49 +0800
Tag:    v2.6.0-beta

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

commit 23dd6b7ebf53b3fce43f42905578ac93f7d96693
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:29:56 +0800
Tag:    v2.5.1

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

commit 211c4734522822f52089d210462d1fa594360b37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:29:21 +0800
Tag:    v2.4.5

Merge branch 'MDL-39760-MOODLE_24_STABLE' of https://github.com/lucisgit/moodle into MOODLE_24_STABLE

commit 410899e3b237fe9be55cfcdb878e5cb3cc9875e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:25:54 +0800
Tag:    v2.3.8

Merge branch 'MDL-39760-MOODLE_23_STABLE' of https://github.com/lucisgit/moodle into MOODLE_23_STABLE

commit 615a5aa6f1a766c7223f0d0a9e1a2c80342df66e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:19:20 +0800
Tag:    v2.6.0-beta

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

commit 9505fcffe49a1d22d9cb6d7c851bb79e818b4ae8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:08:47 +0800
Tag:    v2.4.5

Merge branch 'MDL-39280-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit f8dcecfd07e792b1cfe9ace617ea71f15a51f61b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:44:20 +0800
Tag:    v2.6.0-beta

Merge branch 'mdl26dev-MDL-40130-let-course-category-caching-be-used' of git://github.com/brki/moodle

commit 12a9b4ec3a7d7f36783bdeef79a82e314b47eb2b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:43:54 +0800
Tag:    v2.5.1

Merge branch 'mdl25-MDL-40130-let-course-category-caching-be-used' of git://github.com/brki/moodle into MOODLE_25_STABLE

commit 1d713c7c53f1e73b3a45edfafc04f385dd6733b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:42:29 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40294_m26_plugininfo' of https://github.com/skodak/moodle

commit 2d9161791f7787b2180fdb8169a355d997ed0a36
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:22:30 +0800
Tag:    v2.6.0-beta

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

commit 9cf6081027b21f8f60cbb012df42fa4015eb1bd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:21:54 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-38347-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit a2e47d596a9f4624e2e83ba368567984752b040d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:20:27 +0800
Tag:    v2.3.8

Merge branch 'wip-MDL-38347-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit 8448a12a33877a0b1fcd270ceba41617709c76f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:30:19 +0800
Tag:    v2.6.0-beta

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

commit 405a60712b1364e9c419fc0f02fd3f77d36b1204
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:30:08 +0800
Tag:    v2.5.1

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

commit 6d4fe99033fae3ec5b064992710d1be4cbefdaf7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:29:06 +0800
Tag:    v2.4.5

Merge branch 'MDL-28124_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit c209e592067965efdd4cd4b60fc4b286ce6edfcd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:28:46 +0800
Tag:    v2.3.8

Merge branch 'MDL-28124_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 0b20ce2841d7b718c512171cc8afae4427467331
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:00:20 +0800
Tag:    v2.6.0-beta

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

commit ef03bb6d9fdeacb5d105b30fef2c11be743c1815
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 04:57:44 +0800
Tag:    v2.6.0-beta

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

commit 11fb83fee808e5e437dbbbb95f76a7187e95f374
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Jun 2013 10:06:41 +0800
Tag:    v2.6.0-beta

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

commit 9d109ad60df4deb1099150a43c83e95e67587cc1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Jun 2013 05:13:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w25_MDL-33955_m26_curlredir' of git://github.com/skodak/moodle

commit ef6650f703a5625d95f42445af9a5fb50d2d88d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 11:35:37 +0800
Tag:    v2.6.0-beta

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

commit 07cfd5e599140c8e7063441188700f572c8be03e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 11:34:30 +0800
Tag:    v2.6.0-beta

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

commit 36096f0fe921bc50114d1b1321dc022b4326a1d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:51:06 +0800
Tag:    v2.6.0-beta

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

commit 70d4b3182d8f5f90e30715985c144cfec670fda9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:50:47 +0800
Tag:    v2.5.1

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

commit 0f8d5064f1ac1a783f653cbebb4e4ead5cff9634
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:47:25 +0800
Tag:    v2.6.0-beta

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

commit 5c8cfccad347d57fd99886b1ae96fb5c47aeedab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:29:08 +0800
Tag:    v2.6.0-beta

Merge branch 'w25_MDL-26455_m26_installport' of git://github.com/skodak/moodle

commit 1b194c904762d067f81361ed48b5aaa714153a46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:06:33 +0800
Tag:    v2.6.0-beta

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

commit ad3d3c2ba7eb02a00c0fb88695c114d930c4830c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:01:54 +0800
Tag:    v2.6.0-beta

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

commit 663c69e9740ddcdd1b6c9efda030588d95330cdd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 09:59:30 +0800
Tag:    v2.5.1

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

commit 23f186b5c8224551b591c4a13fbc57c1d0f1092a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 09:58:48 +0800
Tag:    v2.4.5

Merge branch 'MDL-40036-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit eaf48543592cb4752454d33d740f90ee105093a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 09:54:56 +0800
Tag:    v2.5.1

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

commit 044bb690f8269196a4e31b8f9bfb22db0c2dc284
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 09:54:39 +0800
Tag:    v2.6.0-beta

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

commit d35d8311909a716b1f2b346b4787078e7cd03bef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:38:05 +0800
Tag:    v2.6.0-beta

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

commit 407020ef8c096dacd2b7f67c6e04d6c9feab9ac2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:26:23 +0800
Tag:    v2.6.0-beta

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

commit 7d7a6e3c20a2daeef19f0cf17e39d52d63105c31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:22:40 +0800
Tag:    v2.6.0-beta

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

commit 21467b44613422dfb9070f38030df33b327e09f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:19:35 +0800
Tag:    v2.6.0-beta

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

commit 3d19b183c66157e3f426bddd13feb4d891a4410c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:19:30 +0800
Tag:    v2.5.1

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

commit 46c30b7e1bce11f211f8f41884d5ea495b729f3b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:19:22 +0800
Tag:    v2.4.5

Merge branch 'wip-mdl-39863-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 540a8f8499e0cf9160d75cb0abbb120b743b6e99
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:08:45 +0800
Tag:    v2.6.0-beta

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

commit d81ebc8f0dafb7a572978252ed102604217b8287
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:07:57 +0800
Tag:    v2.5.1

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

commit c8802b6e6c5d5705f63a4fc2133af5053020ca76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:07:48 +0800
Tag:    v2.4.5

Merge branch 'MDL-40109_24' of git://github.com/dmonllao/moodle into MOODLE_24_STABLE

commit e667bd9db0299a4c511af178af0aaf6841beade7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:03:21 +0800
Tag:    v2.6.0-beta

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

commit 007b5f5f35063a1554ac587d63efd785ae9a976d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:27:11 +0800
Tag:    v2.6.0-beta

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

commit 54c7d518f3f9fd0e0fb9b82608abf7ba09c4b88e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:26:53 +0800
Tag:    v2.5.1

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

commit 5008f4fffd6c8d7da6717e7e8167dc95742bae4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:26:27 +0800
Tag:    v2.4.5

Merge branch 'MDL-30132_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit 62c4ccef0e025a71d497341de0af9448bd51aa43
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:26:10 +0800
Tag:    v2.3.8

Merge branch 'MDL-30132_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 03d34e07c0390bdacfe4aaa5b7655e29cd8356d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:04:18 +0800
Tag:    v2.6.0-beta

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

commit 7b8783b751822e0277e9edab8dd086271a3be809
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 05:04:27 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-40159-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit df86b97f1ad4c0feb9a4457581b0035c7d71c89b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 05:03:54 +0800
Tag:    v2.3.8

Merge branch 'wip-MDL-40159-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

commit 68e33c29321a4ea3c3cd435010893523b119ccbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 12:14:00 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle

commit e15bf9b1e5ee05cb8e81f8ee54d60f067db34ba4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 12:10:38 +0800
Tag:    v2.5.1

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

commit c4eab12234cfd693fcac9e267b6d9ae5064da639
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 12:09:52 +0800
Tag:    v2.4.5

Merge branch 'm24_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit 4dac72bcc8d8f9db46c908213b64a5d209666767
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 12:09:36 +0800
Tag:    v2.3.8

Merge branch 'm23_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle into MOODLE_23_STABLE

commit ca64174031bef45e8231745f60f08cf121154cba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:45:56 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-21933_master' of https://github.com/mr-russ/moodle

commit 1d1b52eb0cb559732ffc91e82ac3d09129d04710
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:45:33 +0800
Tag:    v2.5.1

Merge branch 'MDL-21933_25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit 57efe7bdbab7ec54237266cd771aaaef7bf7eebc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:45:16 +0800
Tag:    v2.4.5

Merge branch 'MDL-21933_24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE

commit 0b79440ddfdd75a24900e28879b1fc97053af494
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:44:58 +0800
Tag:    v2.3.8

Merge branch 'MDL-21933_23' of https://github.com/mr-russ/moodle into MOODLE_23_STABLE

commit e4ce39c99fb8a68be2d53c7f5bd7fa661bc5633f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:43:31 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40091-master' of git://github.com/satrun77/moodle

commit 209658eab2c8e38a45d22a55c417a6350ef542a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:43:18 +0800
Tag:    v2.5.1

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

commit 11270c4b2dac960ca2f6c6b55b1d15c2542e6be5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:43:07 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-40091-MOODLE_24_STABLE' of git://github.com/satrun77/moodle into MOODLE_24_STABLE

commit a971dd39929c09e0a344383bef27f6566ccfc822
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:42:55 +0800
Tag:    v2.3.8

Merge branch 'wip-MDL-40091-MOODLE_23_STABLE' of git://github.com/satrun77/moodle into MOODLE_23_STABLE

commit d63082454b6850c5cabec3b1bcd7939041a98a70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:10:41 +0800
Tag:    v2.6.0-beta

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

commit 8c155823cc61f80ff42c2da715838e3da46769b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:10:21 +0800
Tag:    v2.5.1

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

commit e41ecc6260146fe3595e20db1d1ae39479454950
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 10:30:24 +0800
Tag:    v2.6.0-beta

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

commit 443563a82ee921bc497af87ff07cd8d31abc7f8c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 10:26:37 +0800
Tag:    v2.5.1

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

commit 79cb5006f972204de97c9d2506e163f6daf685b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 10:26:13 +0800
Tag:    v2.4.5

Merge branch 'MDL-39761-MOODLE_24_STABLE' of https://github.com/lucisgit/moodle into MOODLE_24_STABLE

commit 1691794cb1ee30fa0ec396ab2083c83564f889a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 10:24:37 +0800
Tag:    v2.3.8

Merge branch 'MDL-39761-MOODLE_23_STABLE' of https://github.com/lucisgit/moodle into MOODLE_23_STABLE

commit 7d1d4137cac75313f7f32bcf31457edddeed6260
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 06:01:10 +0800
Tag:    v2.6.0-beta

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

commit 44df0d9aaa8e4905af73a24c28bdcd566461ea4c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 07:36:40 +0800
Tag:    v2.6.0-beta

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

commit e1e6c0dd4ca35b64de568ce6d0d865147863a653
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 06:21:45 +0800
Tag:    v2.6.0-beta

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

commit aae402010b49e51bd6844d9de45eaa8637fe6d55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 06:14:14 +0800
Tag:    v2.6.0-beta

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

commit ac547b717af2727b5fc46a74efea47ef2c359f0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:48:56 +0800
Tag:    v2.6.0-beta

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

commit ee4e6c04e20f4dbd68635a85cb9b1df497192dc5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:38:38 +0800
Tag:    v2.6.0-beta

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

commit 5d24aff39fbbc5a3ed7a5bb194e63bca6afd1d80
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:34:06 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle

commit 18a1f186db87adff8589a4e387ccc0b1341b396f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:08:55 +0800
Tag:    v2.6.0-beta

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

commit cc5468de0e5fca96790fcb72c1377dc092405c27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:07:01 +0800
Tag:    v2.6.0-beta

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

commit 69303857c75c373dbe1914f9019ba48e0d282998
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:06:33 +0800
Tag:    v2.5.1

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

commit 7b50002304418f46c36ea0c2cf642a7c57e44c50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:04:22 +0800
Tag:    v2.6.0-beta

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

commit a4848b404463c028f4cc70b7b76431539be5465d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:02:40 +0800
Tag:    v2.5.1

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

commit 0ad16081a2f207d21844a2755fc62c3636900c6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:02:27 +0800
Tag:    v2.4.5

Merge branch 'MDL-39964-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 9439d0506c59cd3cb7db2dd4099c6cec302c96c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:00:24 +0800
Tag:    v2.6.0-beta

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

commit a6b980d13b6d40f9292c896a1c0fbc567c310a3b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:00:11 +0800
Tag:    v2.5.1

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

commit 8fd47854a6685a9b6eef827b5f4c38084c84493c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:00:01 +0800
Tag:    v2.4.5

Merge branch 'MDL-25901-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 1d26199125ad170fa781cda49ded1470ae398073
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:59:32 +0800
Tag:    v2.3.8

Merge branch 'MDL-25901-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 9ce7b61e62eef0f4d739477bf4d8328d44eaf467
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:54:09 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-38109_m26_pluginlist' of git://github.com/skodak/moodle

commit 9e53bbd007ed6b7b0a2af8727a7c8c0835c5a54c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:53:49 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-38109_m25_pluginlist' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit ec18f333bdebda9f21a8c8d5382f15311d206526
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:51:59 +0800
Tag:    v2.6.0-beta

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

commit e0699a7154b5235d631b148fb53a4ce8391e6378
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:51:21 +0800
Tag:    v2.5.1

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

commit 754fa1091627ecb6285c984daabf878bc52a87ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:48:00 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-39820_master_2' of git://github.com/gjb2048/moodle

commit aa41f96d1a501c82b698464a2b121bfda34495b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:46:45 +0800
Tag:    v2.5.1

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

commit 30db96bd90b6b5aa5ede5de390479d446d0c98d6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:36:18 +0800
Tag:    v2.6.0-beta

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

commit 11ea436f4fe598e746f1e198e36d1600a85504f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:31:51 +0800
Tag:    v2.6.0-beta

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

commit 624f270a262fc411dc79e66824b8c2c651e6fdd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:31:36 +0800
Tag:    v2.5.1

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

commit ffb486a996aa8db3166533f75a559191cff29159
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:31:24 +0800
Tag:    v2.4.5

Merge branch 'MDL-26925-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 3a2ad025e1e93a3a3867fa497b7e4df686636fc9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:30:58 +0800
Tag:    v2.3.8

Merge branch 'MDL-26925-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 2a31efea1b69e6cfd8851a9d73cb8700c222afb3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:16:15 +0800
Tag:    v2.4.5

Merge branch 'MDL-39505-migrate-file-backport_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit f3358600e77540af03defd99023a3466add89f84
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:15:47 +0800
Tag:    v2.3.8

Merge branch 'MDL-39505-migrate-file-backport_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit 3343cd5d92f759c39ef5b38be819055c4b5d551c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:08:21 +0800
Tag:    v2.3.8

Merge branch 'MDL-22390_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit c1dfb624bf3043d294bb188a64d9554803d11b90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:07:33 +0800
Tag:    v2.4.5

Merge branch 'MDL-22390_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 313bcd5268c173f9ebfecb784c3bd683f38d2bbc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:07:24 +0800
Tag:    v2.5.1

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

commit 2b46a31a3f57c1dae0c01f5f8cc577c012aae3cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:07:14 +0800
Tag:    v2.6.0-beta

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

commit ae82c2858895baa9a0d41c3a6d07d7e78e616a46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 10:16:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39490-format_rewrite_order' of git://github.com/mudrd8mz/moodle

commit b9565a00709ba572486017e0beec88096b124c14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 09:32:36 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-37490-m7' of git://github.com/gjb2048/moodle

commit 10c98b64e6b755fdff2d1e0b11d496543e8b105f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 08:26:55 +0800
Tag:    v2.6.0-beta

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

commit b26a15ff67cf738be8aee56341b71c1d9c4db8a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 08:26:42 +0800
Tag:    v2.4.5

Merge branch 'MDL-39454-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 5d37fd271d588145c14acbe1e24cf26148cdd1b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 07:06:17 +0800
Tag:    v2.6.0-beta

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

commit 9052fc4489844e0e8d17f6c684b984a88fd8fcd4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 06:35:10 +0800
Tag:    v2.6.0-beta

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

commit 2afd7d0277477f35c170b71df758ab96bd364ba6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 06:31:55 +0800
Tag:    v2.6.0-beta

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

commit bd7004d51c1e96dacfa6043941d70bb136ed86cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 06:29:11 +0800
Tag:    v2.6.0-beta

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

commit 8affd1ca7e433402221cc8d75149a33a2a8220b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:55:14 +0800
Tag:    v2.6.0-beta

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

commit 4fe8c2c7994daa418de4152bb4643fef516b625a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:54:52 +0800
Tag:    v2.4.5

Merge branch 'MDL-40009_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 94be2b507433af032128bb982d63c5fe0eca548f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:54:34 +0800
Tag:    v2.3.8

Merge branch 'MDL-40009_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

commit b8904b6ad5e56decba9d2b1322858870813485a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:49:04 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-39549_m26_cohortsearch' of git://github.com/skodak/moodle

commit afe247a0ca5ac05ec747cc5243924a663b5b3a55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:48:11 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-39549_m25_cohortsearch' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 5dbb8b3909bf7bfda6a1c94e4b6a59c5a0f18347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:47:49 +0800
Tag:    v2.4.5

Merge branch 'w24_MDL-39549_m24_cohortsearch' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 628e0528e846563440512b7a9d0fc1d7dc36b703
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:47:38 +0800
Tag:    v2.3.8

Merge branch 'w24_MDL-39549_m23_cohortsearch' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 56ad6d46d103d173ed5f2a749a0b62cad208bd47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:09:43 +0800
Tag:    v2.6.0-beta

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

commit f7c29429616221c11cac1d233974db9bbb528763
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:09:34 +0800
Tag:    v2.5.1

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

commit e7b6fc35bfb2d9ed052642e1965d7546a52f7170
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:09:28 +0800
Tag:    v2.4.5

Merge branch 'MDL-39971_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit b87dc0e925f8166aa68b4f3d82865644d584450e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:09:22 +0800
Tag:    v2.3.8

Merge branch 'MDL-39971_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 018fc94211b5b8b85cae1615d7e342a53b4efd07
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:48:21 +0800
Tag:    v2.6.0-beta

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

commit f981643f585929445d10d47f9e323af268a79993
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:44:40 +0800
Tag:    v2.5.1

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

commit bf0cdbcf8ae0a1a44a0dc2d6908dc081138747d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:41:21 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle

commit 2f8602990f81cde9fe88041a919b747ff40130fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:41:07 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-32480_m25_imscp' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 1db4d513a794a7ce1ad8b9decb7d12313478a687
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:40:53 +0800
Tag:    v2.4.5

Merge branch 'w24_MDL-32480_m24_imscp' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit f83cd734f972997187687978e97368e2cbbc5887
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:39:54 +0800
Tag:    v2.3.8

Merge branch 'w24_MDL-32480_m23_imscp' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 111f5291f9437bb7a0f9f9beb24d2453fce6b48d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:26:04 +0800
Tag:    v2.6.0-beta

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

commit fb8010732e2800655ca814b0f8ad1a19ec6933b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:31:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-36090_log2' of git://github.com/andyjdavis/moodle

commit 4964633e3a39df732c7bf8214db6ef49a0a8d7e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:30:46 +0800
Tag:    v2.4.5

Merge branch 'MDL-36090_log2_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit ad6976aae575a8c05d21edd78da96c3ce3e0aad0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:30:24 +0800
Tag:    v2.3.8

Merge branch 'MDL-36090_log2_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 2c0fb4c788446ffb3abab42f24b23167830d5faa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:14:17 +0800
Tag:    v2.6.0-beta

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

commit 08c2a3ca1fd4108a889fc30a2ddc4f7e0bbe9642
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:14:04 +0800
Tag:    v2.5.1

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

commit e559265c10265759569fe1d90510a1ebd58d234f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 07:43:31 +0800
Tag:    v2.6.0-beta

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

commit a6d966885bbccb608b5f8ad58e224dc2e4f5bdd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 07:35:26 +0800
Tag:    v2.6.0-beta

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

commit 00afef17bb68bce4b3f15d1b8fd7eb8dd32b7108
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 07:33:59 +0800
Tag:    v2.5.1

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

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 e09afa518415463d452a0bea399a7f571805cde0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 10 May 2013 12:40:59 +0800
Tag:    v2.4.4

Merge branch 'MDL-39602-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit a32772051f4823ebe458662e3c01201efeef3c5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 10 May 2013 12:30:52 +0800
Tag:    v2.4.4

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

commit a2d06016f4e64f959d4f5d5fe5d2f9cae06a8f68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 10 May 2013 12:30:29 +0800
Tag:    v2.3.7

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

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 be9d851c07b8637e42e704d241bd7260b4f47e35
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:14:28 +0800
Tag:    v2.4.4

Merge branch 'MDL-39422-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit b6bfe3b35cd3787d4cdab90f996571c972ecc099
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:14:12 +0800
Tag:    v2.3.7

Merge branch 'MDL-39422-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

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 eecd7b4412993ff0afcece10bc65c6d44eeccedc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:04:50 +0800
Tag:    v2.4.4

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

commit 55d212631028343abb9c528788afcb6d8e3bd62e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:04:33 +0800
Tag:    v2.3.7

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

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 609d262c176b5a12672e347b072679ee1ed14a50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:02:05 +0800
Tag:    v2.4.4

Merge branch 'MDL-39414-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 8617a082bbe219b0fbcb6f9d1da61364b06e4753
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:01:54 +0800
Tag:    v2.3.7

Merge branch 'MDL-39414-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

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 858131c09c03dccf5a92b24a842e4ea6edff06d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 06:14:09 +0800
Tag:    v2.4.4

Merge branch 'MDL-36060-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit c1163a13feca1631e121998cef1750f6c93503ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 06:13:51 +0800
Tag:    v2.3.7

Merge branch 'MDL-36060-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

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 503630ed47dd15e7951681ce0fdea60728ebd61f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 06:11:46 +0800
Tag:    v2.3.7

Merge branch 'w17_MDL-39344_m23_lists' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 7de740be35c594b5d1e052b02b0fa3f2ac466c02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 06:00:09 +0800
Tag:    v2.4.4

Merge branch 'MDL-39303_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit de0917ef7fa4f677dff18cc47c4ff87c9c97bc02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:59:32 +0800
Tag:    v2.3.7

Merge branch 'MDL-39303_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

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 7e1c6bf8b46242997e48c882a7ab27b34230da93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:36:36 +0800
Tag:    v2.4.4

Merge branch 'MDL-39365-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit b7485643987573beb72a28edf6b93445870e6800
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:36:25 +0800
Tag:    v2.3.7

Merge branch 'MDL-39365-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

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 38fdbcf0014aac7c6b0ccab936b56ecf7484ce07
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:31:42 +0800
Tag:    v2.4.4

Merge branch 'MDL-39398-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit d0fc4cf5394868c3aad35648145eb5f585342930
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:31:31 +0800
Tag:    v2.3.7

Merge branch 'MDL-39398-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

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 3e7b95b4310356264c436308f63179a656096e11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 06:53:49 +0800
Tag:    v2.4.4

Merge branch 'MDL-39192_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 2a6c9c15365844f758bccfeaf9b5b82a5bedcb11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 06:53:33 +0800
Tag:    v2.3.7

Merge branch 'MDL-39192_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

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 b920c4096cdb3dadb314f2745a6a2e0f1e169150
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 07:02:14 +0800
Tag:    v2.4.4

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

commit cbf837ce04141eebb56042d39d0501fbb0a90bb2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 07:01:42 +0800
Tag:    v2.3.7

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

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 d7b2888810c68676af74cd3956eb4a996f73376f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 09:53:36 +0800
Tag:    v2.4.4

Merge branch 'MDL-39185_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 8be4f7da651ada2c07ed6ddae36c0f7bb0d85ce6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 09:53:19 +0800
Tag:    v2.3.7

Merge branch 'MDL-39185_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

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 aec4f1e956444ffd723cec4902c0f92b089d869d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 09:48:07 +0800
Tag:    v2.4.4

Merge branch 'MDL-39135-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

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 c2cef5809eb34867ec46c269fea90226caa94206
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 10:23:09 +0800
Tag:    v2.3.5

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

commit af27002b54c6c54801154a57aabbcac1e56fbbd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 10:22:57 +0800
Tag:    v2.4.2

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

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 b0aca71569d62476c4f664d2bf2de9d5ed67e363
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 04:29:49 +0800
Tag:    v2.4.2

Merge branch 'MDL-38101-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 180e1b2fe92d7f22015d27d30e59bf5fe1d3e3b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 04:29:35 +0800
Tag:    v2.3.5

Merge branch 'MDL-38101-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

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 892ee7ee5636dfb6342913a778e227ce372312d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:12:54 +0800
Tag:    v2.4.2

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

commit ac19bd186a6ec70a977494a8093aab03060c2e0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:12:43 +0800
Tag:    v2.3.5

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

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 fb2ac5029c39a9a2de794b9c08a74a9396f774de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:07:59 +0800
Tag:    v2.4.2

Merge branch 'MDL-35127-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit fa5509b73c560aaace1ad167db3fd5a680ab1607
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:07:51 +0800
Tag:    v2.3.5

Merge branch 'MDL-35127-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 b158bcce98c7e6b32d924b90121358d48c1af7ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 09:18:33 +0800
Tag:    v2.4.2

Merge branch 'MDL-37625-m24' of https://github.com/jfilip/moodle into MOODLE_24_STABLE

commit c3a1ea1843e2d94a7a8a229b80a8f1cfb58a31a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 09:18:19 +0800
Tag:    v2.3.5

Merge branch 'MDL-37625-m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE

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 6a218739e4507598293257fa18168046d4622d5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:59:40 +0800
Tag:    v2.4.2

Merge branch 'MDL-36128-moodle24' of https://github.com/StudiUM/moodle into MOODLE_24_STABLE

commit 8e7afd6bf52285c3d3a6be7f69671c8b127b206d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:59:21 +0800
Tag:    v2.3.5

Merge branch 'MDL-36128-moodle23' of https://github.com/StudiUM/moodle into MOODLE_23_STABLE

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 4ea25c227c12955638ea9288d90da6e360f20fe2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:35:00 +0800
Tag:    v2.4.2

Merge branch 'MDL-38168-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit fb3f9c4a50e0522f87face9083346329ab531350
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:34:47 +0800
Tag:    v2.3.5

Merge branch 'MDL-38168-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

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 b62c8a06ad16f265362c1a20463e91ccf41dc582
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 05:31:30 +0800
Tag:    v2.4.2

Merge branch 'MDL-32125-moodle24' of git://github.com/StudiUM/moodle into MOODLE_24_STABLE

commit 0897b1eab1b70e326c7c002b6fed211a93dc287c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 05:30:24 +0800
Tag:    v2.3.5

Merge branch 'MDL-32125-moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_STABLE

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 823b45cb4926a34e350a4a622288bc67a2a89b85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Feb 2013 10:26:55 +0800
Tag:    v2.4.2

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

commit a515bc1b585be9b08fe76059775645bd246e9e9e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Feb 2013 09:25:16 +0800
Tag:    v2.3.5

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

commit 07f3c79dd4684d3633da524fe4028abb414dd0ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 31 Jan 2013 03:45:32 +0800
Tag:    v2.3.5

Merge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

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 3cb032512246b9ffe5d27a5c78fa7fdac5510053
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 10:23:45 +0800
Tag:    v2.4.2

Merge branch 'MDL-37476-stable24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit 7b86ac4bbc00359c1c308f57293f1c294646301d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 10:23:35 +0800
Tag:    v2.3.5

Merge branch 'MDL-37476-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

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 bb5ebb62806a469645f28a7f15c3f08777b0dd46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 04:56:37 +0800
Tag:    v2.4.2

Merge branch 'MDL-37697-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 09a8ba4aa601590a6b3309abd4a7732de2ac4254
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 04:02:32 +0800
Tag:    v2.3.5

Merge branch 'MDL-37697-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 6a1e56615254b1539dc04aecf9ba65e02faf52b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:54:52 +0800
Tag:    v2.4.2

Merge branch 'MDL-37350-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit c5b346dc13a23d7c3be63610dc230eec31d6f15e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:54:42 +0800
Tag:    v2.3.5

Merge branch 'MDL-37350-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 cd6e980e66023064a09e7a5677892467ca986f9f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:51:39 +0800
Tag:    v2.4.2

Merge branch 'MDL-36881-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 3134895c01483fa805b39ecdb6233305cded4dd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:51:20 +0800
Tag:    v2.3.5

Merge branch 'MDL-36881-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 47795b21266953ef30bafa6de8d4c39839c51759
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:39:23 +0800
Tag:    v2.4.2

Merge branch 'MDL-34671-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 8108e113b34871128e9e9831f6ee9c8b9b3a381f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:39:08 +0800
Tag:    v2.3.5

Merge branch 'MDL-34671-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 21126fc5e8e7528a014bd3077deab2c7b70c4c3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:33:19 +0800
Tag:    v2.4.2

Merge branch 'MDL-37668-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 04093db18a77a44a1eb177c7215fdd7c7e87c1a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:33:01 +0800
Tag:    v2.3.5

Merge branch 'MDL-37668-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

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 353db49bfb2b220036ebee0935f071a30775d9b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:28:12 +0800
Tag:    v2.4.2

Merge branch 'm24_MDL-34231' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit adf01e854b7185179a2bae264f0dcacb91a45d5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:27:23 +0800
Tag:    v2.3.5

Merge branch 'm23_MDL-34321' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

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 a9c75fdc751abab509d28f445cc800feff258425
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:59:48 +0800
Tag:    v2.4.2

Merge branch 'w04_MDL-37638_m24_rolecloning' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 151d0c574dc5b32b0703534602896f9348bad39b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:53:42 +0800
Tag:    v2.4.2

Merge branch 'w04_MDL-37713_m24_testdir' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit ab9008ffb0e9f62a927c67f64373cc9bd2c47e66
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:53:29 +0800
Tag:    v2.3.5

Merge branch 'w04_MDL-37713_m23_testdir' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 611314c09652d70326c96d3c2a87a2d60467e0ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:46:02 +0800
Tag:    v2.4.2

Merge branch 'MDL-37548-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit c01e5b0cd6f1de9c322d0fe336ee755b2c059d23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:45:50 +0800
Tag:    v2.3.5

Merge branch 'MDL-37548-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 3e72333f0c1084eae7dbeef5cc2197fe05ac4c2e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:34:51 +0800
Tag:    v2.4.2

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

commit b0610c8bca91bfed49a51c2782d50f9b551b1c89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:34:40 +0800
Tag:    v2.3.5

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

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 e7a68ca01783a0bb07428e6b6276c1aa9ed5bda0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:29:09 +0800
Tag:    v2.4.2

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

commit c2e15c4619d3fd8475dc20c25eb923c9b071ae81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:28:54 +0800
Tag:    v2.3.5

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

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 72e5445732edfd2442a63699da3f3d34afa7a45a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 11:06:58 +0800
Tag:    v2.4.2

Merge branch 'MDL-13805_others_messages_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit d6fdc727ea7b4568c135f034a04a9dec1648136b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 11:06:49 +0800
Tag:    v2.3.5

Merge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit ac9b9f152c18384df3c7ba48eda6fd336fb91628
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:44:45 +0800
Tag:    v2.3.5

Merge branch 'MDL-37634_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

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 4d572da1b38656d837a5bd30f32a9d785b2c2571
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:41:54 +0800
Tag:    v2.4.2

Merge branch 'MDL-37628-24' of git://github.com/grabs/moodle into MOODLE_24_STABLE

commit 7ec3fd667ae987eefcb1ee6e1c5fcdd7386ac33a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:41:44 +0800
Tag:    v2.3.5

Merge branch 'MDL-37628-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

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 e86e05ebf0022c5708a3c2562d93a1233097da59
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:31:54 +0800
Tag:    v2.4.2

Merge branch 'w04_MDL-37407_m24_chineseunzip' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 452a704ae9b7d4b11bd09dd657a10c3a099a590c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:28:52 +0800
Tag:    v2.4.2

Merge branch 'MDL-37414_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit a83ce21dfba53bd3170ddf3dca1a9fc436f81fa9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 07:02:35 +0800
Tag:    v2.3.5

Merge branch 'MDL-37629-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 362b124e69e2f2a554ba32b04640edcd4b2b9ee6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 06:32:41 +0800
Tag:    v2.4.2

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

commit b5fe549a3c0d3ec0d099cf3b50b512c87e4e28ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 06:32:32 +0800
Tag:    v2.3.5

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

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 7700ec42c16334a93824f0c52d2297cd1590d6aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Jan 2013 06:08:14 +0800
Tag:    v2.4.2

Merge branch 'MDL-34435-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 3ad0ab4e67dd4204b221d0fa924b820553952992
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Jan 2013 06:07:40 +0800
Tag:    v2.3.5

Merge branch 'MDL-34435-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

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 dc5e0d1665545002462f1fa7f5155b7d2d574008
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jan 2013 04:10:31 +0800
Tag:    v2.4.2

Merge branch 'MDL-37563-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 8f3ae32b888d57cf7cf66276eb94833b2df31161
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jan 2013 04:10:23 +0800
Tag:    v2.3.5

Merge branch 'MDL-37563-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 bf14c15fb517583ff22907394571c8451d63d97f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 05:18:21 +0800
Tag:    v2.4.2

Merge branch 'MDL-37295-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit a2400fcf71b363f78b5d7d04618c50e535314f41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 05:18:10 +0800
Tag:    v2.3.5

Merge branch 'MDL-37295-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

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 9afa0e696ea722ce87ff4b5e56eedc6479f0c755
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 04:46:14 +0800
Tag:    v2.4.2

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

commit cf7ace8a3713f274f35fce15e68e410a595c7d76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 04:46:01 +0800
Tag:    v2.3.5

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

commit c5d97a96e4872df051334deac5b772604d31e789
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 04:31:23 +0800
Tag:    v2.4.2

Merge branch 'MDL-36757_hidden_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit cfdc33bf08f6991fbe6174f88d436735eeae0692
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 04:31:12 +0800
Tag:    v2.3.5

Merge branch 'MDL-36757_hidden_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

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 728858263360ced308a5ea1ac625846e064870b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 06:03:23 +0800
Tag:    v2.4.2

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

commit 9bc178f3e616c19565bcfdba7722626d409d6193
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 06:03:09 +0800
Tag:    v2.3.5

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

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 2dcbaaa68c1ac1ca67fd9450613155f3631dbe7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:42:52 +0800
Tag:    v2.4.2

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

commit e5f6a755e785fde80082f106b0d2ef626f717e4e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:42:36 +0800
Tag:    v2.3.5

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

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 b54015e60deab728fcbe19f882fa0bf6a5c456b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 09:08:45 +0800
Tag:    v2.4.2

Merge branch 'MDL-37048-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 0aa523614379fd9c6c2e9a3e47739b392084b9f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 09:08:02 +0800
Tag:    v2.3.5

Merge branch 'MDL-37048-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

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 7e7c23fcadd5e91da6a7185e82b6785a0206635a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 08:39:53 +0800
Tag:    v2.4.2

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

commit 34342983859a427ce4f1563279be3e7f9a6579ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 08:39:43 +0800
Tag:    v2.3.5

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

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 625098abc57b4a33018068454b4e7654847d3558
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:23:49 +0800
Tag:    v2.4.2

Merge branch 'MDL-36095-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 7fa6857c3bd6c9224d7bb19043ab2bd6a7af9968
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:23:37 +0800
Tag:    v2.3.5

Merge branch 'MDL-36095-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

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 7977c782e8cfadb1e71793b3b48ef567f9aaa28e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:12:41 +0800
Tag:    v2.4.2

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

commit 39bad86b14023cfc92d7243d74297027644081a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:12:30 +0800
Tag:    v2.3.5

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

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 842524812a3aa6d271953650b01d1a794d7f6ed8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:46:01 +0800
Tag:    v2.4.2

Merge branch 'm24_MDL-37394' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit e824c58aa8dc7c9142ea23332f490646441b59b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:43:29 +0800
Tag:    v2.3.5

Merge branch 'wip-MDL-36335-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

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 80b6e318fbb4ba21846dc15c173f46624b7e6343
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:04:40 +0800
Tag:    v2.4.2

Merge branch 'MDL-37397-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 096bb297f7aeddbd631907b2376bb6050663953b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:04:28 +0800
Tag:    v2.3.5

Merge branch 'MDL-37397-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 7c2046b727a173f80902f349560f6c23433c5b08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 05:59:47 +0800
Tag:    v2.4.2

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

commit 571c2784d6252c07fe44fedd8e7fefd12f2ed561
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 05:59:23 +0800
Tag:    v2.3.5

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

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 d72a0aa2c8a6ac00d760091b6f5a0433c3dc6226
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:06:50 +0800
Tag:    v2.4.1

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

commit b7af1eee2d57516e64fc4fcea107d1fc96e5edcc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:06:36 +0800
Tag:    v2.3.4

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

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 2be82d5e13017bcb45fffa81760243864b6999d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:00:23 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-35893_m24_perfinstall' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 e04f57c95b31720ebd9a434522caf251ffcf8fa1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 09:15:17 +0800
Tag:    v2.4.1

Merge branch 'MDL-37161-moodle24' of https://github.com/StudiUM/moodle into MOODLE_24_STABLE

commit fc77cb3d85278200d49ffa803934ca169d10ca10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 09:14:28 +0800
Tag:    v2.3.4

Merge branch 'MDL-37161-moodle23' of https://github.com/StudiUM/moodle into MOODLE_23_STABLE

commit 4e805e91c791d6dbbbe2e83fa61fc66d3735cd97
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 09:13:55 +0800
Tag:    v2.2.7

Merge branch 'MDL-37161-moodle22' of https://github.com/StudiUM/moodle into MOODLE_22_STABLE

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 b9639c524d45863cd5ca4d167c677bd9833674cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:44:54 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-36212_m24_entities' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 178a5b4102cba92eb3969b0fd2f102e75646a286
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:44:36 +0800
Tag:    v2.3.4

Merge branch 'w51_MDL-36212_m23_entities' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 52817fdbbcd9508098bf2070a6edf78bb1c1c09e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:39:52 +0800
Tag:    v2.3.4

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

commit e6f5bd2633ed1d7f311905632369618be3f1b0ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:39:32 +0800
Tag:    v2.2.7

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

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 192cb8f89449ddfc4a13b1ea1e2aad6d1fd301f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:35:04 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37281_m24_othersnav' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 757376d7dd2635368d69566d95131a2f1f202a1c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:33:45 +0800
Tag:    v2.3.4

Merge branch 'w51_MDL-37281_m23_othersnav' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 2d7c42275f190324949d7fb1b2a6ec2a7b49ce68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 07:05:07 +0800
Tag:    v2.4.1

Merge branch 'MDL-36855-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit a68bc19fa6031a6a697f508baa21d4d04275f272
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 07:04:51 +0800
Tag:    v2.3.4

Merge branch 'MDL-36855-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

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 49a66d4b68f9ad8531d2046ffffd1a7120a3f803
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:15:11 +0800
Tag:    v2.4.1

Merge branch 'MDL-16730-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit d9402acd03e114cd15245bbd7338f25f747e3b1b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:14:54 +0800
Tag:    v2.3.4

Merge branch 'MDL-16730-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 75c6461ac17d3cf9287131cc369f0f30e1501499
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:14:40 +0800
Tag:    v2.2.7

Merge branch 'MDL-16730-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 0fbadb557b046c29ebb093acfdaed96bba2b3e70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:01:13 +0800
Tag:    v2.2.7

Merge branch 'w51_MDL-37280_m22_langstring' of git://github.com/skodak/moodle into MOODLE_22_STABLE

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 1a5a5f8e9c9532fefc1e5a7e4ffcf008f4c1bec5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:52:50 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37105_m24_catlimit' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 2c6b79365b937b2fe6596bf6e28ab5e82b866ac2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:35:07 +0800
Tag:    v2.4.1

Merge branch 'MDL-29327_none_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit a3a84720d3c9b55041283f22327d3928c58a5bc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:34:52 +0800
Tag:    v2.3.4

Merge branch 'MDL-29327_none_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

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 a589b0dc77c13fe0fafb03bbd134a6b40c12bf98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:15:34 +0800
Tag:    v2.3.4

Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit 146b7ac600754050c5479d8f6f2f6d244643116a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:15:21 +0800
Tag:    v2.2.7

Merge branch 'MDL-36741_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE

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 0c1be2af2178fbb4c4309e6f2f5e12b35cbef8de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:09:25 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37315_m24_ldappaging' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 b09c5ac837a52746e40d42ca0d801f9d07b10976
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:43:46 +0800
Tag:    v2.4.1

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

commit 185eff01fa4d89bb85ffbf351c932539fe02f0d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:43:37 +0800
Tag:    v2.3.4

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

commit 9c829ef34a3dbab56bd9b3d3188836e1a1b004b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:43:27 +0800
Tag:    v2.2.7

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

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 fec305739d9d9a32829c2e17b852b631529d6709
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:16:07 +0800
Tag:    v2.3.4

Merge branch 'MDL-36966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 3124654247af515e5556715698ec3ab46efbbbcd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 05:55:19 +0800
Tag:    v2.4.1

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

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 9a57563b9ff8b738bf117cd09a6a7bab9c7f9796
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:40:44 +0800
Tag:    v2.4.1

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

commit 2c292b48da41ce48e1bb17d789889a2737fb7e14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:40:36 +0800
Tag:    v2.3.4

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

commit 7093fdd80639c794d5113b1d8a1c9c5e0df93082
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:40:24 +0800
Tag:    v2.2.7

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

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 730271af49dd0129d35a3cecb78612278eb504c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:42:49 +0800
Tag:    v2.4.1

Merge branch 'w50_MDL-36475_m24_zindexesgrrr' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 8a35efacd7c6016a4473ded45b9e7e0c1bbabb6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:40:32 +0800
Tag:    v2.4.1

Merge branch 'MDL-36490_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

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 acb011dc20ba5df2f10a5fca0fcaac9f5c663efa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:24:42 +0800
Tag:    v2.4.1

Merge branch 'w50_MDL-37111_m24_forumsinglefirst' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 59fc0958d6f0069518d135d4ddf99037e32c70c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:24:32 +0800
Tag:    v2.3.4

Merge branch 'w50_MDL-37111_m23_forumsinglefirst' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 a7a1adf4e095154501e75581aabc689946758bb6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:12:22 +0800
Tag:    v2.4.1

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

commit b3f46160b4c679b34baa2cdd70632ff6528e78b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:12:11 +0800
Tag:    v2.3.4

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

commit e49fea7d9b6c06bfb2b89087cd772f16e17f23cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:11:53 +0800
Tag:    v2.2.7

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

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 5c65ad28b4a1eecb2d253f31bff387615e4b734e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:07:03 +0800
Tag:    v2.3.4

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

commit b61c5fa26ba850a60ab1ae7db9b1c446b57c1e04
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:06:54 +0800
Tag:    v2.2.7

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

commit ddb5fb5980013f2f087dbcad3b6f9f0d3dfc197b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:57:11 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-35056-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 6c9a77ba0cd00c0b0cb665094aa5dd1969c0fcb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:56:58 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-35056-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit 5ac84901f0869d164befdb8dea1c48f12eeb7681
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:56:48 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-35056-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

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 20da16bb775d9264b78271b2d62a7bb2e2c675d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:51:30 +0800
Tag:    v2.3.4

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

commit 54d50fdb8dc8daeaa2eb3d61682bc335d3c12848
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:51:20 +0800
Tag:    v2.2.7

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

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 cd281ce1b41aa06962d049dfa3c1695a996ea452
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:42:41 +0800
Tag:    v2.4.1

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

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 c20213441e70becc736a8f2ac60cee24a3cb3923
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:42:06 +0800
Tag:    v2.3.4

Merge branch 'MDL-29733_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 3ed2c641f481e1a14e08a67ba8c34bea2eb4bd58
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:41:52 +0800
Tag:    v2.2.7

Merge branch 'MDL-29733_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

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 3ad9a3fda38662ce994b830e05a5cab239ec7c49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 06:09:32 +0800
Tag:    v2.3.4

Merge branch 'MDL-27619_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

commit 9aca16cc0f05cdaf24edb5a6c89b75de58e11bf9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 06:09:20 +0800
Tag:    v2.2.7

Merge branch 'MDL-27619_22' of git://github.com/pauln/moodle into MOODLE_22_STABLE

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 1ce6bdd1ddb00b6599d0d8af277c696f9583d701
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:45:17 +0800
Tag:    v2.4.1

Merge branch 'MDL-29805-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit 1b39edd66227e4dd517b4ca105527b1ef4033e35
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:45:03 +0800
Tag:    v2.3.4

Merge branch 'MDL-29805-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 05e6fefd56ad7281e2a1674d4a2755bcda9821c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:44:14 +0800
Tag:    v2.2.7

Merge branch 'MDL-29805-22' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

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 09fc0fde35e3cf3741bc829bfdb09daf48d42c5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:38:27 +0800
Tag:    v2.3.4

Merge branch 'MDL-35593-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 6896e438c13ffda0ad27ce00b86dcf70987f880e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:38:14 +0800
Tag:    v2.2.7

Merge branch 'MDL-35593-22' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

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 c545dcad4ffc9ea7ce21062960d9bd5fdfc8a834
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:34:44 +0800
Tag:    v2.4.1

Merge branch 'wip_24_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle into MOODLE_24_STABLE

commit 6e89cdb35ff941c701952a36d0cee9af8a5a41fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:34:31 +0800
Tag:    v2.3.4

Merge branch 'wip_23_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle into MOODLE_23_STABLE

commit 2a5953c545fed9d993049d9995bc38682ef34d09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:34:19 +0800
Tag:    v2.2.7

Merge branch 'wip_22_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle into MOODLE_22_STABLE

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 9e9dd64c351b8925618a493b2336d9a7530e75ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:29:12 +0800
Tag:    v2.4.1

Merge branch 'MDL-36321_message_participants_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit eb4933515075040302ea9d140d0decedf461c0cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:28:58 +0800
Tag:    v2.3.4

Merge branch 'MDL-36321_message_participants_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

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 39a36d7d7b1b4274c0888c31cbc55642ea9c19bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:11:08 +0800
Tag:    v2.3.4

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

commit f352dcddba680e448f379bd14dd54f65c3cad8a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:11:04 +0800
Tag:    v2.2.7

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

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 7027fe4538012a560d29a22254c932ad84330ba0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:04:19 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-36731_m24_uploadestrict' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit b54470f497323a553b3af4fcfcc124f204d84d90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:04:13 +0800
Tag:    v2.3.4

Merge branch 'w49_MDL-36731_m23_uploadestrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 237ea8768c92a70cfb3420371657b09a85244180
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:44:32 +0800
Tag:    v2.3.4

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

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 6ff174587334cdbf517871d8e1a400fccd2ec76a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:42:08 +0800
Tag:    v2.4.1

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

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 a2630c08ae8bc44673f2ba15fdb442d5c5d405b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:35:04 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-36936_m24_composerdev' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 1c90b9976da578464ef7a199fc6d5e979a4d189e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:27:14 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-37060_m24_sessinit' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 35cb0e4a4c94707d6aaf6e5ad10fd020b4b376e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:04:22 +0800
Tag:    v2.4.1

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

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 2e6538382a5c11615aa068990b4373c2f85ad59d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:04:17 +0800
Tag:    v2.3.4

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

commit a4982907f85b2d69f4a4c23e08d15331de4a43eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:04:11 +0800
Tag:    v2.2.7

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

commit ada098890bd898478d649444c54c881b8c44fe63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:00:00 +0800
Tag:    v2.4.1

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

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 b74804c8a80704819880a27da7d65ca848fcf69d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:59:50 +0800
Tag:    v2.3.4

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

commit 7439256bbdb85ebbfe13cb0c6a51f4fdf829775d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:59:45 +0800
Tag:    v2.2.7

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

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 b004c163ee13fc2b3fa8b7806be53f028a26992c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:53:49 +0800
Tag:    v2.4.1

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

commit 6d0c04c208b411e2c702e1f36e7bc33bc90ad4ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:44:21 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-37061_m24_invalidlang' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 eda1d3f37ab348669f0b021c4a0d7faf1c752ad2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 05:22:06 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-29442_m24_entityutf8' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 3c805e592c1567a77cbcca7abe449736db6a5f1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 05:10:07 +0800
Tag:    v2.3.4

Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 52d4168038b29ce17b965f7bd6ea3b66bb17bdad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:42:29 +0800
Tag:    v2.4.1

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

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 f1cf05cbbe2cd329207f6932eb6f440c21fe2529
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:41:49 +0800
Tag:    v2.3.4

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

commit 79b123d1bef6e58b0020dfd9caf07c291ecc7a34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:41:29 +0800
Tag:    v2.2.7

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

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 c6bd16545e13ec8ea1dc136fa1cf7558cd77465b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:16:43 +0800
Tag:    v2.4.1

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

commit 667dfa5e7c0af06b4bc951604ee5bce8fe1f033a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:14:59 +0800
Tag:    v2.3.4

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

commit 6575ae513f735f0fa17319bbc977e08fe7648b82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:14:47 +0800
Tag:    v2.2.7

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

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 a9269beb9c990a483d54a6f1b9af535b3e95ffd2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:59:31 +0800
Tag:    v2.3.4

Merge branch 'MDL-30961-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 59fef8ff26efe4f495d099f6da142c02f4abb163
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:59:19 +0800
Tag:    v2.2.7

Merge branch 'MDL-30961-22' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

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 5e6b64571c440d3b96a916f970a88e5a7fc61e09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:28:33 +0800
Tag:    v2.4.1

Merge branch 'MDL-34592_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit e4a2de510c5989c1bcfc3bc081328ad2bb877d1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:28:24 +0800
Tag:    v2.3.4

Merge branch 'MDL-34592_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 7c1b3e252366f9f02d864d77a2b3e41359c4f80e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:28:10 +0800
Tag:    v2.2.7

Merge branch 'MDL-34592_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

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 c446a0fca2bcfd86f1bded274ce151c1d0f04419
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:24:18 +0800
Tag:    v2.4.1

Merge branch 'MDL-36608_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit 15e9d4c64a5f4a61a47e0faa6b6ee5fa898f2d66
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:24:10 +0800
Tag:    v2.3.4

Merge branch 'MDL-36608_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

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 07f89a017c5104107487c295942756f2ee8b6e81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:21:25 +0800
Tag:    v2.4.1

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

commit b35e30e5bcc939e966b92df13402852de6d13df4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:21:08 +0800
Tag:    v2.3.4

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

commit ba66ee75231535eee7e0b3e1a87928423fb6c1e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:20:58 +0800
Tag:    v2.2.7

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

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 b8b1926e2f48cc0337f8c1e42c49ac6a81cb7ff7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:15:54 +0800
Tag:    v2.4.1

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

commit 1f0e0ab503579d0824feb4602a9983061297c339
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:12:24 +0800
Tag:    v2.3.4

Merge branch 'MDL-36607_dndBlocks' of https://github.com/moodlerooms/moodle into MOODLE_23_STABLE

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 2353df33a7061804aef8446e418195fad7c6f487
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 07:13:10 +0800
Tag:    v2.3.4

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

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 f382da5bf9b1ac9ef50c4a0054e86d08febce559
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:51:20 +0800
Tag:    v2.3.4

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

commit 9c11280dc9f29bd070bd7cf90d40298adcda5d40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:51:08 +0800
Tag:    v2.2.7

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

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 0d7605389332707ce64cec26fc590c1d30dec806
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:47:44 +0800
Tag:    v2.3.4

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

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 46210e38e838960afc17cdba931f120ce82abec5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:42:35 +0800
Tag:    v2.3.4

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

commit 180a9220e97659cd5892f8d83997d50c1a338cc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:42:22 +0800
Tag:    v2.2.7

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

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 532577bb97a8b31f53f8dc792598a9a727d0afff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:58:50 +0800
Tag:    v2.3.4

Merge branch 'message_nav_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 7c3ff6f6a6b352126a05e8c152e94704777c1a09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:58:37 +0800
Tag:    v2.2.7

Merge branch 'message_nav_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

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 5b2b3bdaf8973db40d6134cc559da39245618560
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:54:00 +0800
Tag:    v2.3.4

Merge branch 'MDL-36761_loop_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 4d0eabf19eacb39294be0a035b93c08458676136
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:53:47 +0800
Tag:    v2.2.7

Merge branch 'MDL-36761_loop_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

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 0b4767ca50dfdf6f8e5d081c0cc282984ee34901
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:48:59 +0800
Tag:    v2.4.1

Merge branch 'MDL-34591_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE

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

Merge branch 'MDL-34591_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

commit 9980628209878b6fa3eed5a1b695bdbd4990a375
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:48:19 +0800
Tag:    v2.2.7

Merge branch 'MDL-34591_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE

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 45fd888c52c51fe58c7ddee5f027b26d319d1604
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:41:20 +0800
Tag:    v2.3.4

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

commit 59fdbc53b2464f0bd76d5642357894709901bb08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:41:11 +0800
Tag:    v2.2.7

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

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 f384987eadf5f9522af5d264297ae936220ace3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:33:33 +0800
Tag:    v2.3.4

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

commit e32da64ee478affe73436934a4329c8dd2c4735f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:33:20 +0800
Tag:    v2.2.7

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

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 4dd8a25f5ddb61920f176e8eb691cf018e443133
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:27:07 +0800
Tag:    v2.3.4

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

commit 624e1d1197a38a1b8dff226e7bab3ba0880eca64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:26:55 +0800
Tag:    v2.2.7

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

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 1b696de61bc654e82bd832499312a75db300145e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:23:44 +0800
Tag:    v2.4.1

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

commit 289f5e85e73daea1326ea11da5958ea84a09acac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:23:35 +0800
Tag:    v2.3.4

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

commit 0cdd8fe9d470642400182f969d38a09a40669e90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:23:25 +0800
Tag:    v2.2.7

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

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

commit cf0451133fa4f668e763e5909747ac82a761c279
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:19:22 +0800
Tag:    v2.3.4

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

commit 6b02b455a4341d97f19f21a0dafe1eaa2cbdbd4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:19:13 +0800
Tag:    v2.2.7

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

commit 97df01569076f6f0bc1f110a90d127ecf54e2968
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:48:12 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36336_modLtiRestoreGrade' of git://github.com/moodlerooms/moodle

commit 0b7a458885807313ada12471a902eff8f6c321c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:47:53 +0800
Tag:    v2.3.4

Merge branch 'MDL-36336_MOODLE_23_STABLE' of git://github.com/moodlerooms/moodle into MOODLE_23_STABLE

commit e6ee93d1a3ffa32c53d0fd7163d4837193956b68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:47:41 +0800
Tag:    v2.2.7

Merge branch 'MDL-36336_MOODLE_22_STABLE' of git://github.com/moodlerooms/moodle into MOODLE_22_STABLE

commit 6167badf621556ae23cc07878312f1f3e4865a7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:41:42 +0800
Tag:    v2.4.0-rc1

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

commit 01afb8024f4bd601c2eb007fa79a67b95e9d23dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:41:35 +0800
Tag:    v2.3.4

Merge branch 'wip-mdl-36238-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 479f5b6e6d60af46f16bc1aaa944378d684a77dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:40:30 +0800
Tag:    v2.2.7

Merge branch 'wip-mdl-36238-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 58014c562114a1525d03e9782ca4bff1322a0a0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:25:24 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle

commit 03af084b52430fadba85b372f0343f2c5ed902cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:24:56 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-34530_MOODLE_23_STABLE' of git://github.com/jason-platts/moodle into MOODLE_23_STABLE

commit 2644c4f33a41be316a7e44d339b7393af1ce584b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:14:47 +0800
Tag:    v2.4.0-rc1

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

commit acd51c5217ddad0bfb2a6970542829f7f76ee7af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:12:53 +0800
Tag:    v2.4.0-rc1

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

commit 4254a7495c041a01aed5687cbb2a38461dc5894a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:12:30 +0800
Tag:    v2.3.4

Merge branch 'MDL-36012-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit fd6ab92b1dc5052f3ad978a92091baf2b09da949
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 05:57:09 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-35997-wip1' of git://github.com/mouneyrac/moodle

commit 0aa6247168f6445373b0361b944cc956161abefd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:38:57 +0800
Tag:    v2.4.0-rc1

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

commit a28e3a600749eb84dcf92f8e8e5e500df0ff9198
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:22:08 +0800
Tag:    v2.4.0-rc1

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

commit 13669ef4d8afa5dddac5e6be4756fd477bfae8db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:21:55 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-36795-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

commit 8725c4401bf9d7ebc61353734a48f1d4c0b4ada1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:21:46 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-36795-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 7ad3fc1f80fe9adb88fea7c287192d5716a79841
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:10:37 +0800
Tag:    v2.4.0-rc1

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

commit 77f3688b2fed13c838eab607444845650ea77d8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:10:25 +0800
Tag:    v2.3.4

Merge branch 'MDL-35760_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit fa8d78a4855ee35c976e2f81d4f109a2fd9b6a33
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:05:40 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36829' of https://github.com/kastashov/moodle

commit 75ca9964a5e51bc0bc1e1004dad838b9fd511aa7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 05:41:41 +0800
Tag:    v2.4.0-rc1

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

commit 4c14127cdbeb97c1cf3f4d45f925616638b97c85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 05:40:57 +0800
Tag:    v2.3.4

Merge branch 'MDL-36760_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit d6347b056df3276710c14ced12ca89ecf2d49af7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 05:40:20 +0800
Tag:    v2.2.7

Merge branch 'MDL-36760_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 8a423efda9684a889458141d4f81af669957df55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:58:13 +0800
Tag:    v2.4.0-rc1

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

commit 55f8a9c7666230fe27362e38a8ed59c8771bd37a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:57:57 +0800
Tag:    v2.3.4

Merge branch 'MDL-36609_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit f3fc480228316c99ef76edc4887f08adfd0c66f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:57:31 +0800
Tag:    v2.2.7

Merge branch 'MDL-36609_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE

commit 4d9e8469e12fa5e37909d8499fe6c000c333986b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:46:25 +0800
Tag:    v2.4.0-rc1

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

commit 176207119416e683f754edc25666c29eff97496e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:44:40 +0800
Tag:    v2.4.0-rc1

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

commit f9fa262aa92f05d066ee03016d9af513527a4158
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:44:27 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-36551-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

commit 066fc70ece13cea72aa5661aab7af30643bc0779
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:44:09 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-36551-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 93e490613ebf8f28ed4c930dfe672b4366c41617
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 06:42:28 +0800
Tag:    v2.4.0-rc1

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

commit 8f718da4371f3bab75efebe0c0e89c153e8df25d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 06:42:13 +0800
Tag:    v2.3.4

Merge branch 'MDL-36763-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit c7efe8b783213d1751af5875b37cf06cbd6db258
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 06:01:15 +0800
Tag:    v2.4.0-rc1

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

commit 6254d1d2eed27689b4157a1129bf0a70d445e86d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 05:40:58 +0800
Tag:    v2.4.0-rc1

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

commit 703b86eefbf4b529295ee36d040ab4df94a1b5e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 05:31:57 +0800
Tag:    v2.3.4

Merge branch 'MDL-35963-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit f1a90cc4fedc23bbbf25bc9422b80c457ba00275
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 05:24:42 +0800
Tag:    v2.4.0-rc1

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

commit 82053086bcf41096af40efc164f4d66a38c41d9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Nov 2012 04:15:34 +0800
Tag:    v2.4.0-rc1

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

commit d540132fb57f9df26f9c600aacb0b5d110a0a1cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Nov 2012 04:00:35 +0800
Tag:    v2.4.0-rc1

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

commit fa99332779da6fe33909bf5e8e275947be19de4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Nov 2012 04:00:17 +0800
Tag:    v2.3.4

Merge branch 'MDL-25552_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit 4d7259e53d3a2ff758ef7d4c2024e78d0558cbd2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Nov 2012 11:42:52 +0800
Tag:    v2.4.0-rc1

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

commit 0d463df0728ad54328bbeb1430074472139747b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Nov 2012 06:55:12 +0800
Tag:    v2.4.0-rc1

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

commit 41d17e48c76ddd971435a7a726dcd694cf5d4294
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Nov 2012 06:51:13 +0800
Tag:    v2.4.0-rc1

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

commit cb33680c2279a31a563dd019a0d6212a282b8abe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Nov 2012 05:25:04 +0800
Tag:    v2.4.0-rc1

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

commit 41439e6c8d530025a6d2cee4a454a5cebaa94fbe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Nov 2012 09:58:48 +0800
Tag:    v2.4.0-rc1

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

commit 99072482f656198eca1a783ea18d26f54b366827
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Nov 2012 09:55:22 +0800
Tag:    v2.3.4

Merge branch 'MDL-36589_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit b7696aa0b6d901e8740a06d42016b0c2ec51eb11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Nov 2012 09:55:13 +0800
Tag:    v2.2.7

Merge branch 'MDL-36589_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit f89a1a88765c5f5ec5ed3e6fad3ec4cda99c798e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 06:30:49 +0800
Tag:    v2.4.0-beta

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

commit 24f4515576c4b2f00b28b72d8ce0cb0fa1a36cc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 06:07:15 +0800
Tag:    v2.4.0-beta

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

commit 62d543748d15f33beac397ce06999572dcd760a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 06:06:58 +0800
Tag:    v2.3.3

Merge branch 'MDL-36271_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

commit e3071745bbc38da2452eecad041609dc9fafe152
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 06:06:41 +0800
Tag:    v2.2.6

Merge branch 'MDL-36271_m22' of https://github.com/markn86/moodle into MOODLE_22_STABLE

commit 9a0e6f147d0d6f964152e2cd915fa384399e4ab1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 05:57:52 +0800
Tag:    v2.4.0-beta

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

commit 5252ec82a238e8e4ac3eb21bc00f82810d29ac11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 06:00:16 +0800
Tag:    v2.4.0-beta

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

commit 02adb1e30d33731e9b6bd012cb6ea90baf1ea205
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 05:34:06 +0800
Tag:    v2.4.0-beta

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

commit 2ede3d7f3569a58a290314bd27c9b07699fa0cdb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 05:08:43 +0800
Tag:    v2.4.0-beta

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

commit b733b0ac71b830707465a0245e547b6b6c7b7af8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 05:08:31 +0800
Tag:    v2.3.3

Merge branch 'MDL-31629-MOODLE_23_STABLE' of git://github.com/micaherne/moodle into MOODLE_23_STABLE

commit 3e8532dadcb8d04ca8cbc73cda13abb6a9d1584a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 05:08:22 +0800
Tag:    v2.2.6

Merge branch 'MDL-31629-MOODLE_22_STABLE' of git://github.com/micaherne/moodle into MOODLE_22_STABLE

commit 544c4553579475e7fbb431e6249dcef40f272279
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 11:27:43 +0800
Tag:    v2.4.0-beta

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

commit 18f6238b88d353a8f4533679828b2ad40813b94b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 11:27:30 +0800
Tag:    v2.3.3

Merge branch 'MDL-21625_b_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit fdd57e090e235d994f3fc77bba46d31f1fcaaa9d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 11:27:15 +0800
Tag:    v2.2.6

Merge branch 'MDL-21625_b_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 1385f1d8fb740488a85bf87285adc8a394cebb28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 10:07:21 +0800
Tag:    v2.4.0-beta

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

commit a82535f068cdcb47836faeab93d2d88af3754f90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 10:07:00 +0800
Tag:    v2.3.3

Merge branch 'MDL-36107b-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

commit c575fef5ece1d94875c47342f648d6567852e4eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 03:35:25 +0800
Tag:    v2.4.0-beta

Merge branch 'm24_MDL-36359_Typo_admin_rediect' of https://github.com/scara/moodle

commit 84582748454d3f52b3b5081c4883f65856b26e85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Oct 2012 12:35:18 +0800
Tag:    v2.4.0-beta

Merge branch 'w43_MDL-36145_m24_yui373' of git://github.com/skodak/moodle

commit eecddb8fd47877fc0cbaa212ed66011703b1b20e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Oct 2012 05:15:44 +0800
Tag:    v2.4.0-beta

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

commit ee8c1abcea617220512a8487aa285292f4b67e3c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Oct 2012 05:15:29 +0800
Tag:    v2.3.3

Merge branch 'MDL-31934_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 61f0581a022aa0cd8cdbd269461f7ce60f5c339a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Oct 2012 05:15:18 +0800
Tag:    v2.2.6

Merge branch 'MDL-31934_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 81b5ff0e8e2938395fdd71dca3c7ee015f2b80e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 12:37:06 +0800
Tag:    v2.4.0-beta

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

commit 3b6796e0f41f1ec02b269c15b7d4fb70d34a0fe7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 12:36:45 +0800
Tag:    v2.3.3

Merge branch 'MDL-28235-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit e16c4341405be883688c83b4fa6df71b6c6b2faa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 12:36:33 +0800
Tag:    v2.2.6

Merge branch 'MDL-28235-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit e118ad21c99d7b59fdb2f348754b89ab5eefd29c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 11:00:45 +0800
Tag:    v2.4.0-beta

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

commit c8757a3c8778c4ba3b72e7206c3ac6a95de9b740
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 10:48:54 +0800
Tag:    v2.4.0-beta

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

commit aa7d8ef61f60e5e1535c64040a6fb7ff342d925f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 10:48:49 +0800
Tag:    v2.3.3

Merge branch 'MDL-35889-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit b277186a4ecd594eefa707d9631626e5b343712b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 10:48:45 +0800
Tag:    v2.2.6

Merge branch 'MDL-35889-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 21d31a23a03b519f67141b725ac31fba5dae2157
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 08:31:30 +0800
Tag:    v2.4.0-beta

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

commit a9ab988e431242d52a0c83ea88c40004509cd679
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 08:02:24 +0800
Tag:    v2.4.0-beta

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

commit e61d57b5c152fc28c6b0717d357584ccce815b66
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 08:02:07 +0800
Tag:    v2.3.3

Merge branch 'WIP-MDL-36070-M23' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE

commit 41b4e5ec7fd86e66d0912392fd3b54caff12ed89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:59:23 +0800
Tag:    v2.4.0-beta

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

commit 1d6d520a5a266651414c3e9043cfae70b7566f05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:59:12 +0800
Tag:    v2.3.3

Merge branch 'MDL-36076_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 0be66059a24915f055071be2d22ac6a92b23cc52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:59:02 +0800
Tag:    v2.2.6

Merge branch 'MDL-36076_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit ca55ce4b355d9dfcb5ea40442d94193721d78aaa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:54:56 +0800
Tag:    v2.4.0-beta

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

commit ebaa74a3e0ceae58b9bf08a32d144d481feb5d67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:52:00 +0800
Tag:    v2.4.0-beta

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

commit 3b5513528eb2c1bedbc55c158b76eccc7f7c0c8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:51:44 +0800
Tag:    v2.3.3

Merge branch 'MDL-36103_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 15b3f4332662c431fe03a8d41e723705fe7f4c0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:51:34 +0800
Tag:    v2.2.6

Merge branch 'MDL-36103_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 86c0eb48ba3629cd26af7b5c2f6fca983e464d5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:31:22 +0800
Tag:    v2.4.0-beta

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

commit 558aecf818af171cd19aae89147987cdfa6d6d27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:24:31 +0800
Tag:    v2.4.0-beta

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

commit efd2f83e4a6eb3f056717df9735fd85b708fdefb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:24:19 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-36131-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 7080f72c73bf41873be6124e2c94a2e326e98001
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:17:11 +0800
Tag:    v2.4.0-beta

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

commit b9697365a1c25d0260eae86a2a5c4af0af4a4954
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:16:50 +0800
Tag:    v2.3.3

Merge branch 'MDL-36137_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 7e5c720495154f3728c4a26947b178b6c8d45e06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 17 Oct 2012 10:57:36 +0800
Tag:    v2.4.0-beta

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

commit a896bc32cd9bfaffe19c3669fce4afef37ffb4d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 17:41:49 +0800
Tag:    v2.4.0-beta

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

commit 777354509d3ab3ba52ab9ed97dd7f6a58c48bf06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 17:41:31 +0800
Tag:    v2.3.3

Merge branch 'MDL-35412-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit d3eb32a44e28d6c5d0a140700560b76ec8ecc05b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 17:41:19 +0800
Tag:    v2.2.6

Merge branch 'MDL-35412-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 2bbf03ce3bc80d387a025343bc5ffaa5478997bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 13:31:44 +0800
Tag:    v2.4.0-beta

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

commit 4740c0a64f76d448f40f7c4dda98df8d9f357612
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 13:31:31 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-33857-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

commit 8422094d912293351605371cad82899663666678
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 11:23:24 +0800
Tag:    v2.4.0-beta

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

commit c35fa27c89170314a336198a80251b819174659e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 11:23:02 +0800
Tag:    v2.3.3

Merge branch 'MDL-35198-MOODLE_23_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit d270f6c22d314dd43b8d2e24a3fc165586aede74
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 11:22:44 +0800
Tag:    v2.2.6

Merge branch 'MDL-35198-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 58e033193f86e8c6845998908edc227419b46d92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 11:16:33 +0800
Tag:    v2.4.0-beta

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

commit a7aa82b3ac7f09dd732837ce62dced921b799221
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:42:51 +0800
Tag:    v2.4.0-beta

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

commit 52d2556ee557a9e80ea560f2c2c2685e1f12e55c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:42:42 +0800
Tag:    v2.3.3

Merge branch 'MDL-35664-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit d6361e618a0240281e46b174a03bed32059908e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:31:56 +0800
Tag:    v2.4.0-beta

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

commit 86606ad75dca1839fec9432ac4827a8b6dcd0a0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:31:51 +0800
Tag:    v2.3.3

Merge branch 'MDL-35892-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit efd6156e4d035568c245e902ad58e95bb9c9729d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:16:26 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35726' of git://github.com/netspotau/moodle-mod_assign

commit 5004ad85b7e2f03f21b5d898ead7dfffb422895c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:16:19 +0800
Tag:    v2.3.3

Merge branch 'MDL-35726-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

commit ee17d12db16ab41af8733099db504d1d950e26a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:11:04 +0800
Tag:    v2.4.0-beta

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

commit dc67f522cff23b0fb292966d99aab8a7006833f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:36:57 +0800
Tag:    v2.4.0-beta

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

commit cafabb5fd01e1570dc82109d40c3107d0907467c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:36:21 +0800
Tag:    v2.3.3

Merge branch 'MDL-35634-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 0766ae0049b5772af6ca9e9cfa564e45345fa2f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:36:12 +0800
Tag:    v2.2.6

Merge branch 'MDL-35634-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 382d11a43c202c4a92167ebcb2b60ea89f5acc02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:18:54 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35288_dndupload_folder_warning' of git://github.com/davosmith/moodle

commit 68b9d1f408dec48003b68a706e364061afee916a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:02:44 +0800
Tag:    v2.4.0-beta

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

commit fff33fd66d5db77bc1bd6ba4c361611a3ee11184
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:02:33 +0800
Tag:    v2.3.3

Merge branch 'MDL-35211_M23' of git://github.com/kordan/moodle into MOODLE_23_STABLE

commit c11496e22da1338f9d63c9865dbee1c224f03aa9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:02:24 +0800
Tag:    v2.2.6

Merge branch 'MDL-35211_M22' of git://github.com/kordan/moodle into MOODLE_22_STABLE

commit 30939d2a9a45875ac7c2673b3de0be01707e0616
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:44:18 +0800
Tag:    v2.3.3

Merge branch 'MDL-35763-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

commit 2a00249df5322f8fc7f3c2f28c299373caea18da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:44:10 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35763' of git://github.com/netspotau/moodle-mod_assign

commit da2ebe0474483352b3abdd15fd94eaa00c62ecca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:40:35 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35764' of git://github.com/netspotau/moodle-mod_assign

commit e8edb00c7352f41c4f8890f327218be246cb5ddb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:33:48 +0800
Tag:    v2.4.0-beta

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

commit 9201c33bb77bff1753a5488e035903222b11f1d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:22:18 +0800
Tag:    v2.4.0-beta

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

commit 8c2eca7d163e1a4a2e6459db9104ccda37c6226b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:22:06 +0800
Tag:    v2.3.3

Merge branch 'MDL-33646-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 2a2d855e14e2bd5088e3a6a2f2f41443dbcec099
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:15:49 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35667_extra_credit_loop' of git://github.com/andyjdavis/moodle

commit f605b97aa4f5f755be87e8226afe879934076b25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:15:37 +0800
Tag:    v2.3.3

Merge branch 'MDL-35667_extra_credit_loop_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit ac78fb7625c5f661878ecec7bbf2b65f41a7346f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:15:29 +0800
Tag:    v2.2.6

Merge branch 'MDL-35667_extra_credit_loop_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 4c5f42b400f89d1a163943e1e571d2e73beeb163
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:06:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35730' of https://github.com/aolley/moodle

commit b855945836343604f6b198d771e795d3218d4484
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:06:12 +0800
Tag:    v2.3.3

Merge branch 'MDL-35730_23' of https://github.com/aolley/moodle into MOODLE_23_STABLE

commit 4f012c5e581f28f4d5c655e92f28646eac02a02d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:05:52 +0800
Tag:    v2.2.6

Merge branch 'MDL-35730_22' of https://github.com/aolley/moodle into MOODLE_22_STABLE

commit 40b26758db2ef1e3cb09eb733b4d1780bc7ad9fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 05:07:37 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33829-master' of https://github.com/andyjdavis/moodle

commit c67ed6adfe88ea0b378fbb9c287ce75b7d898967
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 05:07:16 +0800
Tag:    v2.3.3

Merge branch 'MDL-33829_23' of https://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit bd465e3917e0ab451a7a18e5216431cc91d81b70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 05:07:04 +0800
Tag:    v2.2.6

Merge branch 'MDL-33829_22' of https://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 9289c14e0c81f1a044909b040cd6c68fc46f083a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 04:53:11 +0800
Tag:    v2.3.3

Merge branch 'MDL-35654_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit a0251e5006e8f59d4c8b2e90d8f6558612fec3a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 04:53:05 +0800
Tag:    v2.4.0-beta

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

commit ee3502e793a041befaf3637a3264f729fa7e7724
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 06:10:39 +0800
Tag:    v2.4.0-beta

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

commit 577777cf03b120ea9da05d89cfcaae74ad934991
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 06:10:24 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35472' of git://github.com/totara/moodle into MOODLE_23_STABLE

commit d5cb1a40966f9bea25173c97adb7bac2c3e94597
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 06:10:13 +0800
Tag:    v2.2.6

Merge branch 'm22_MDL-35472' of git://github.com/totara/moodle into MOODLE_22_STABLE

commit e737ad93a1c8159823439d9434d764b7f7c7c10c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:46:01 +0800
Tag:    v2.4.0-beta

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

commit 500ade05cb6defc8174278947273902ebaf975aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:45:51 +0800
Tag:    v2.3.3

Merge branch 'MDL-34257_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 4fd7c545cc321d59997d4b0d2b1e93f5a41150ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:45:44 +0800
Tag:    v2.2.6

Merge branch 'MDL-34257_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit cf452060062556960a81c235a94ac270f52c15d6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:31:13 +0800
Tag:    v2.4.0-beta

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

commit 4891199f10e0868c2ecf54182c1dcb096bca233a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:31:08 +0800
Tag:    v2.3.3

Merge branch 'MDL-30885_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 6beec9ce60e617d1aab60b3f4a6ce6c9a4265d7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:15:41 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35547' of git://github.com/enovation/moodle

commit 50b252cdde3b4613276e6544d65cbc70b455f0f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:15:30 +0800
Tag:    v2.3.3

Merge branch 'MDL-35547_23' of git://github.com/enovation/moodle into MOODLE_23_STABLE

commit 7697512a90cf00c13581965d970057cfab2956a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:15:19 +0800
Tag:    v2.2.6

Merge branch 'MDL-35547_22' of git://github.com/enovation/moodle into MOODLE_22_STABLE

commit 4aede312e7c2e9eb59903b10336ea312f4a5bca1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 11:50:56 +0800
Tag:    v2.4.0-beta

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

commit 41a5203c2a5b5964a2be00c89934434eb93936ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 11:13:33 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-35276-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

commit 57264882c7fbde6bf4e6cf6c6f9caa21e7867c0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 10:27:52 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-34476-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit c89613edaaa372a3f5d75e1082f76a6b29132fff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 06:20:13 +0800
Tag:    v2.4.0-beta

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

commit 678e90a08004365902ae2f87ca5e1bc949da6ef3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 06:10:23 +0800
Tag:    v2.3.3

Merge branch 'MDL-34573_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 414568e1446cbc58a41f46f65fc84a6af73b53ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 06:10:11 +0800
Tag:    v2.2.6

Merge branch 'MDL-34573_accessibility_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 86d055360cc9dfabd1280a30e997dcce916a2b50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:40:11 +0800
Tag:    v2.4.0-beta

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

commit 1172c2bd2f3c254cb27e95640d9bb53bf002bed0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:32:52 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-34476-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit d122b474567e9b1e560dd3eb6997ae3226910f63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:32:41 +0800
Tag:    v2.2.6

Merge branch 'wip-MDL-34476-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit d998c1a4405a434e02f25b42748ce7927c2eb3a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:20:53 +0800
Tag:    v2.4.0-beta

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

commit 4c6962068ae664731a6dbdf4b87ddfa3cfb56b51
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:20:37 +0800
Tag:    v2.3.3

Merge branch 'MDL-31976-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 1b00f61d8763f5a9bc8e31a1f66133ff673fbc50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:20:30 +0800
Tag:    v2.2.6

Merge branch 'MDL-31976-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 22d38f8b2ead8532882f26505be4b08e27444691
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Sep 2012 05:54:52 +0800
Tag:    v2.2.6

Merge branch 'MDL-34607-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 8a7cc012fd2f2e941ce32485614c26de7c03334a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Sep 2012 05:52:00 +0800
Tag:    v2.3.3

Merge branch 'MDL-34607-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 52ebfade63a90de4379623548d577f6e15911023
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Sep 2012 05:51:28 +0800
Tag:    v2.4.0-beta

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

commit fd0758da1b43bca789dc1feff530eb8f45f0810e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Sep 2012 05:23:27 +0800
Tag:    v2.3.3

Merge branch 'MDL-35375-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

commit b39e6f59d646eb2161c74e3b77a80dcc2648dfdb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:54:04 +0800
Tag:    v2.4.0-beta

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

commit e1a809b36f5b2f42819410d96baec553b1315218
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:53:48 +0800
Tag:    v2.3.3

Merge branch 'MDL-35312-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 3b9ed3037f85b3dfc57b310a0de88a74d83876d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:42:06 +0800
Tag:    v2.2.6

Merge branch 'MDL-35379-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 81a92474f274466d8461533b7495648741229bf1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:21:34 +0800
Tag:    v2.4.0-beta

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

commit 1e112f8801a6c6cddb3336d697d450c656c84172
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:21:28 +0800
Tag:    v2.3.3

Merge branch 'MDL-35517_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 782a1b46330c514dc6cdbe695555610de540714e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:21:21 +0800
Tag:    v2.2.6

Merge branch 'MDL-35517_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit d324d74e391c18733e8ca2f9e4bb038088ae72c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:15:05 +0800
Tag:    v2.4.0-beta

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

commit 9c8299972d99a721c7bed03622bde82eb4f61bad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:06:25 +0800
Tag:    v2.4.0-beta

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

commit daa9be54c0c3dbcf50b32261e15999c4fee1c368
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:05:54 +0800
Tag:    v2.4.0-beta

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

commit 3c6510c106ce40440085dde3b5d15decc44d091e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:05:44 +0800
Tag:    v2.3.3

Merge branch 'MDL-30889-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit d2621a28f58a015a8bf39392ce02d7c2f92c2071
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:05:35 +0800
Tag:    v2.2.6

Merge branch 'MDL-30889-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 8272c63abfd0a6415632e891bf560bbc49208ecd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:05:01 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35389' of git://github.com/raymondAntonio/moodle

commit 91cb7bdab58eac874561a7d354ae2a9addcfeeb6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:03:26 +0800
Tag:    v2.3.3

Merge branch 'MDL-35398-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

commit 071128c9ace3d527f0dd177990bae6132f86ae47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:03:08 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35398' of git://github.com/netspotau/moodle-mod_assign

commit 7a01f7dbc1ad46d0b4dbeb82abb15dab560bd2a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:00:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35427' of git://github.com/netspotau/moodle-mod_assign

commit 66c0368a9e854997a2d5e2a712b4986e1f9b45fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 10:59:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35435' of https://github.com/raymondAntonio/moodle

commit 8ea8461b3f8e613fc4573a0a43dbbde208621797
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 10:53:43 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33431' of git://github.com/netspotau/moodle-mod_assign

commit 36b76c1ff91dca31237dfc771bc1a121dffde59d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:25:47 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-32125_forum_subscription_change_reflected' of git://github.com/kanikagoyal/moodle

commit 04ec524d74dd1463d7fd053faf9c9123bca4a7cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:25:29 +0800
Tag:    v2.2.6

Merge branch 'm22_MDL-32125_forum_subscription_change_reflected' of git://github.com/kanikagoyal/moodle into MOODLE_22_STABLE

commit fd9a54c2e3cd1013d86c722c91607d4d007a51b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:19:30 +0800
Tag:    v2.4.0-beta

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

commit 77ef5e06f9291cc6360223c692102cc60b2a74ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:18:20 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-30667-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit b7367b9638154dcc3c38c4657a266473fc0532e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:18:03 +0800
Tag:    v2.2.6

Merge branch 'wip-mdl-30667-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 4113e2951e4c0de84a8a484571a05373bcb7a126
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:13:01 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29872_c' of git://github.com/rwijaya/moodle

commit cdf30c74d8c958b4dfe61ff6e2ce37988b542e42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:12:47 +0800
Tag:    v2.3.3

Merge branch 'MDL-29872_c_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 0686d3dc4c1ef1e1207b75255e7cd2c67eb4e68d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:12:37 +0800
Tag:    v2.2.6

Merge branch 'MDL-29872_c_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 37d3caac5124287e2c945eb92c92a2c3062597f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 07:35:41 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34088' of git://github.com/raymondAntonio/moodle

commit 6aa130499b17d02c88f1825b456b6902a3cb5de8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 07:00:31 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-34568' of git://github.com/rajeshtaneja/moodle

commit 939d182d1e5faa451b34236c4e3e54f294a232d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:50:57 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34223-master' of git://github.com/marinaglancy/moodle

commit 561cbb8967a6e0f2138fd7687f210d317cb08642
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:33:35 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-34223-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

commit 1d26f4a5de5a1bca94049e0c11c4c90ec0659052
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:28:16 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-30829-master' of git://github.com/FMCorz/moodle

commit bdd6847fc2a9d1989b6738ef8a29dafe8171a4f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:27:54 +0800
Tag:    v2.3.3

Merge branch 'MDL-30829-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit b95d2cc35e531301d3081fca3f6dd991dcb69dbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:27:40 +0800
Tag:    v2.2.6

Merge branch 'MDL-30829-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 223285a6403f06d630ee946d5f474f8d8ebc83eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:22:54 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34692' of git://github.com/raymondAntonio/moodle

commit f9959166ca98d8a595c51ec2107a5fdc10b51283
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 12:46:13 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35190' of git://github.com/mouneyrac/moodle

commit d5e317882db6d94f9e96aac5a25083bf13efc9c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 12:45:45 +0800
Tag:    v2.3.3

Merge branch 'MDL-35190-MOODLE_23_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 92a763eb55d4e62d02bbfe6697b0323774fe1821
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:31:32 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34765-master' of git://github.com/FMCorz/moodle

commit 6ab9c3e2ad119152a227842c816756e47e79894e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:31:20 +0800
Tag:    v2.3.3

Merge branch 'MDL-34765-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit ccbf68066bd381b0a5e240e992fedb923fad2d73
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:31:09 +0800
Tag:    v2.2.6

Merge branch 'MDL-34765-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 1d856f68db1d9c51c2b02ba70b04500aa6d48091
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:22:39 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-30018' of https://github.com/stronk7/moodle

commit bbd89d7b1059e112eef8f0f5409fd44cc4115333
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:21:59 +0800
Tag:    v2.3.3

Merge branch 'MDL-30018_23' of https://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 4340e2faace07f7eb45870cd789640515648a749
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:21:44 +0800
Tag:    v2.2.6

Merge branch 'MDL-30018_22' of https://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 35cd9f1f83f937f72b167e21afec0064564447ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:19:16 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-10259_master' of git://github.com/dmonllao/moodle

commit 08153276ac9252eb03604f6e775c59ddf1372490
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:18:40 +0800
Tag:    v2.3.3

Merge branch 'MDL-10259_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 1db9d1e7ec24f7e37c91fdeddd4127b158ed708c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:18:31 +0800
Tag:    v2.2.6

Merge branch 'MDL-10259_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 84342b4e3c9e0395f04b37dbafbfcec2174fcb17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:10:59 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-30857_master' of git://github.com/dmonllao/moodle

commit d27a76c3e3335b4bb411606170145e3b047818c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:10:48 +0800
Tag:    v2.3.3

Merge branch 'MDL-30857_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 22f55d840cf86cfa148027bfe7fa18259a90c438
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:10:39 +0800
Tag:    v2.2.6

Merge branch 'MDL-30857_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 72258d36dbbfa36539a41e60f0ae1f78dc1f2e76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:08:11 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-33755' of git://github.com/danmarsden/moodle

commit 60871abb53bafe7c51b284da04afb94a133e7d46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:02:30 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-34755' of git://github.com/danmarsden/moodle

commit 6d661aa2f10da3cd7aa3bc64f31a7ca827f025e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:02:26 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-34755' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 6396fb3dabf3c7b08747c5a5f29208c7823e2925
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:11:02 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-35255' of git://github.com/danmarsden/moodle

commit cb3a1e355bdf531de5316b3b39c33d8d6812b702
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:10:55 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35255' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 4bf0aea9ddfbdd5145d4929c4b2a927402257b5d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:06:26 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34916_master' of git://github.com/kordan/moodle

commit 654338074ea161177eb982a7b743fe259f9388d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:06:14 +0800
Tag:    v2.3.3

Merge branch 'MDL-34916_M23' of git://github.com/kordan/moodle into MOODLE_23_STABLE

commit b818dfc2d7e3c316b4a00b884bade3e7c625c7b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:06:04 +0800
Tag:    v2.2.6

Merge branch 'MDL-34916_M22' of git://github.com/kordan/moodle into MOODLE_22_STABLE

commit f28896b6157f8b60c2a6779c4db3fbafec59d684
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:33:04 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34794' of git://github.com/raymondAntonio/moodle

commit 7c4fe15b2d8b53e5bd1b0616ddd15e46c1f42b8b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:15:45 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-27786-master' of git://github.com/ankitagarwal/moodle

commit 74fae5244c162c9ef0c4ca43efc92a7ffe13ee51
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:15:25 +0800
Tag:    v2.3.3

Merge branch 'MDL-27786-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 94ff6cf6fb261c9274d42bcc71792936df51adb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:15:14 +0800
Tag:    v2.2.6

Merge branch 'MDL-27786-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 204ce6858beb2feead096a64d50a6122e702d14b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:10:39 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33374-master' of git://github.com/ankitagarwal/moodle

commit 1595c976dd094f1bc7485c118ce1095c2a895aed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:10:26 +0800
Tag:    v2.3.3

Merge branch 'MDL-33374-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit f50e16d07e26736040db2792cc70ce9f31a7a807
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:10:15 +0800
Tag:    v2.2.6

Merge branch 'MDL-33374-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 27b1b2855274a106cd5fbf624c6a23442da468c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:07:29 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35007-master' of git://github.com/ankitagarwal/moodle

commit 5a05aa96335127122ccb3f0de9c0b9f1b1e0d2e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:07:25 +0800
Tag:    v2.3.3

Merge branch 'MDL-35007-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit c91614ef529cf864241faa31bd6e7405054716b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 06:38:23 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-32785-master-v3' of git://github.com/abgreeve/moodle

commit b5b82ae943836c4cbd19e99cd7c4f9627bd34029
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Sep 2012 12:50:36 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-30022_message_duplicate' of git://github.com/andyjdavis/moodle

commit df4e81835a251ad0c90495ff6918b5508a252ef7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Sep 2012 12:50:23 +0800
Tag:    v2.3.2

Merge branch 'MDL-30022_message_duplicate_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 21a87e501af56c4974d08356947ad26f3a0be29d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:28:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35109-available-updates' of git://github.com/mudrd8mz/moodle

commit 8169e2f46bec5297cdce7b57323f9671a0ca4ff9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:28:18 +0800
Tag:    v2.3.2

Merge branch 'MDL-35109-available-updates_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit c367e7fe4e4ae7b6f0a8d310d4ccb179cedca023
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:20:38 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31496_master' of git://github.com/dmonllao/moodle

commit 3d1cbc0df3e7175f80e2526340f75bd33be98363
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:20:25 +0800
Tag:    v2.3.2

Merge branch 'MDL-31496_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit e40113160683514c35043456aca5ce0c47ad73b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:20:16 +0800
Tag:    v2.2.5

Merge branch 'MDL-31496_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 78cdd4cd414d88de558ceb32c0691052950d069c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:16:03 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35029_master' of git://github.com/dmonllao/moodle

commit c458ba6cd75deb9222ba185495d48fd33cc857d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 07:45:00 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34991' of git://github.com/nebgor/moodle

commit 0363a5b3fa1227d1f2e80007cdc1ba114cc424cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 07:40:29 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-26882-master' of git://github.com/ankitagarwal/moodle

commit bcbfd0257488020e3df6a4f3ed2d60c794b8cfa5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 07:26:07 +0800
Tag:    v2.3.2

Merge branch 'MDL-26882-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit c0941ec9963dc38be6c94113bacaf2ba1b01ea75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 07:25:57 +0800
Tag:    v2.2.5

Merge branch 'MDL-26882-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 05f7680f3e72d2598ed65b426a5ed2f1fb69c613
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 06:12:50 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34318-master' of git://github.com/abgreeve/moodle

commit f38508168f150303b5824dd6fa8446bcf57e2115
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 06:12:37 +0800
Tag:    v2.3.2

Merge branch 'wip-MDL-34318-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

commit 926fffa1463316f62e55e350593be84fd056c3af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 06:12:15 +0800
Tag:    v2.2.5

Merge branch 'wip-MDL-34318-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit f9e38429a851081f46c4cad34123ac1ab27a8d73
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 06:01:50 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-30020c' of git://github.com/srynot4sale/moodle

commit 9f66e643903ac28d88ce2ff8ab46bf479d5844f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 05:52:20 +0800
Tag:    v2.3.2

Merge branch 'MDL-30020c-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

commit 1ac4b314f6f1ceb948c012ecf6ab89eb213dc9e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 05:52:12 +0800
Tag:    v2.2.5

Merge branch 'MDL-30020c-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit 0bb0f086ac1b9ec5cf6e65d440353755f66f704f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:48:40 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33640_master' of git://github.com/MaxThrax/moodle

commit 36e6961fa41fc20ed65fe6f22a5e22bb61b7533f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:48:27 +0800
Tag:    v2.3.2

Merge branch 'MDL-33640_23' of git://github.com/MaxThrax/moodle into MOODLE_23_STABLE

commit c52c03406404afe02ebcd556c1fbda5c6e3b9941
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:24:45 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33531_master' of git://github.com/dmonllao/moodle

commit a9c8c1c95144d9ed23d8432712f92a5f8d4fb56c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:22:08 +0800
Tag:    v2.3.2

Merge branch 'MDL-33531_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 5d44dbd1eb2a2f7564a273a68a21f32f0266aa94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:21:57 +0800
Tag:    v2.2.5

Merge branch 'MDL-33531_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit d68a9af478261284f2cd31ababa9dab43c08de87
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 09 Aug 2012 09:23:18 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34471-master' of git://github.com/ankitagarwal/moodle

commit e432bf2472a1564190f6d217d83e7be16c7f5d44
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Aug 2012 11:05:39 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34471-master' of git://github.com/ankitagarwal/moodle

commit 563c436ece4bc1189ae927f677e6d7ca416b125b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Aug 2012 10:24:09 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34075-master' of git://github.com/abgreeve/moodle

commit fffe12fd95438a6006273c527eb552eacaf5fd1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Aug 2012 08:07:59 +0800
Tag:    v2.4.0-beta

Merge branch 'wip_MDL-32412_afterburner' of git://github.com/lazydaisy/moodle

commit 60312b31895cc0ef65baa30bca5f2f8dc1f6fdfc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Aug 2012 05:43:44 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-32002' of git://github.com/danmarsden/moodle

commit 68690602185f698ecf113a20d1f156e22ff0c7c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 09:36:44 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34074-master' of git://github.com/abgreeve/moodle

commit b84be095b744447267884610b5961502cf3812a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 08:05:21 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34708' of git://github.com/nebgor/moodle

commit f52c5f8b6a147c699d3c69e66f17ec14be8fd44e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 08:05:08 +0800
Tag:    v2.3.2

Merge branch 'MDL-34708_m23' of git://github.com/nebgor/moodle into MOODLE_23_STABLE

commit 5831c9f89103ce42edd39f4c05aecf3e85335623
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 08:04:40 +0800
Tag:    v2.2.5

Merge branch 'MDL-34708_m22' of git://github.com/nebgor/moodle into MOODLE_22_STABLE

commit 71761f8aa8729b0361bc8c363313a3497914b97e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:59:07 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-28486-master-2' of git://git.luns.net.uk/moodle

commit a34c42bd5e1b7ce0a1a3bd69a59b0df398266303
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:58:45 +0800
Tag:    v2.3.2

Merge branch 'MDL-28486-MOODLE_23_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 8cca2fbb6e9722627f12796405ac2e84e98027af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:46:26 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34658-master' of git://github.com/grabs/moodle

commit 98aa996a006b3d36b99475aa84edc464de1dd129
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:44:24 +0800
Tag:    v2.3.2

Merge branch 'MDL-34658-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

commit 297e891c1fa4cc8e824f3f2f467ccbc9c5011d57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:44:09 +0800
Tag:    v2.2.5

Merge branch 'MDL-34658-22' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit e7ea7825d2c1510139beccbb9c6e0ce33b98aeb1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:35:33 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34670-master' of git://github.com/grabs/moodle

commit 1dba7b9a40772283fd63eb9246696a96ea072d6c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:05:24 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34645' of git://github.com/aolley/moodle

commit 3d84e69328368461a3f7a8ce409a6c7bf9e9d700
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:04:57 +0800
Tag:    v2.3.2

Merge branch 'MDL-34645_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE

commit 07d8e5cfa7cd990b7e389fd68f634a5d71f86a94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:04:47 +0800
Tag:    v2.2.5

Merge branch 'MDL-34645_22' of git://github.com/aolley/moodle into MOODLE_22_STABLE

commit eff3e7f6776250f395b43b94704b79ab9b760412
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 06:59:10 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34647' of git://github.com/aolley/moodle

commit 9d705d49015ab7b417358f863ab32a315b777094
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 06:58:44 +0800
Tag:    v2.3.2

Merge branch 'MDL-34647_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE

commit f5543aa05e8c5ea5ed7c82ed1aad6bcfc4cd66af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 06:58:18 +0800
Tag:    v2.2.5

Merge branch 'MDL-34647_22' of git://github.com/aolley/moodle into MOODLE_22_STABLE

commit 90105eb95aecc89acc016442e7abbaeebc76ebbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 Aug 2012 09:21:03 +0800
Tag:    v2.3.2

Merge branch 'MDL-34534-MOODLE_23_STABLE' of https://github.com/micaherne/moodle into MOODLE_23_STABLE

commit df0d0fdee728973d02ec92e227516ac6a5f2d8b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 Aug 2012 08:35:19 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29909-master' of https://github.com/mackensen/moodle

commit 118530e6053872e65743914ee5df1b3e33452efc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:57:32 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34526_master' of git://github.com/lazydaisy/moodle

commit acb533009f7a964d368026a96230f5eb2265e9ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:49:31 +0800
Tag:    v2.3.2

Merge branch 'MDL-34528_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit b21f1749576804e087f3c3a0fcabbc5dd8da1fd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:49:20 +0800
Tag:    v2.2.5

Merge branch 'MDL-34528_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 6cb03ab5d34861e315e929f94c068008e7d28f39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:40:37 +0800
Tag:    v2.2.5

Merge branch 'MDL-30515_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 5adf3ec6cbd7de53d01653db4b27f185cfa2c397
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:30:05 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32499_master' of git://github.com/dmonllao/moodle

commit 3c3cf6daaca3fa55e968f38da474c15d2953dad9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:29:51 +0800
Tag:    v2.3.2

Merge branch 'MDL-32499_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 09c3821bf47e6a4bf861bbeb7bcccc5d98f0dd4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:29:41 +0800
Tag:    v2.2.5

Merge branch 'MDL-32499_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit fd892c6f90aeba75843b1d084fa7099db457f02b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:19:01 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32931_master' of git://github.com/dmonllao/moodle

commit fe2ff1e8a0fce18a65339ed1b07ad0cc106a9621
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:18:50 +0800
Tag:    v2.3.2

Merge branch 'MDL-32931_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit dd204f3a8f660d2f0229d64bb291962d35dc2f8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:18:41 +0800
Tag:    v2.2.5

Merge branch 'MDL-32931_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit ac88177985338362dc71dcbcf6e94186abe6fd46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:16:14 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32827-master' of git://github.com/ankitagarwal/moodle

commit dddd0d7a38a853b34f09e2203adfe0a79ec2a3cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:15:59 +0800
Tag:    v2.3.2

Merge branch 'MDL-32827-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit ab474e3e6d2c033687ac5852535a5f378ecd2078
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:15:49 +0800
Tag:    v2.2.5

Merge branch 'MDL-32827-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 989e5c49fae9f6aa39f28df2dc2ec7364db6c52d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 08:43:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34494_master' of git://github.com/kordan/moodle

commit d4533f621535101b3e151fa9d313d1f3eeeebfdc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 08:43:32 +0800
Tag:    v2.3.2

Merge branch 'MDL-34494_m23' of git://github.com/kordan/moodle into MOODLE_23_STABLE

commit 7d5f2ac2e628814043e5b99921d9add402bcc021
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 08:05:38 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29007-master-3' of git://git.luns.net.uk/moodle

commit 30585a3752aa8bba35d0f03506966013c4e58c9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 08:00:53 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-28568_noncontact_warning' of git://github.com/andyjdavis/moodle

commit eec3d1869d29ae8d727168a3bfbbe4546a0cef6c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 08:00:42 +0800
Tag:    v2.3.2

Merge branch 'MDL-28568_noncontact_warning_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit d3fd4849ae74dbb0f488965027c2615d4bb89956
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 07:59:02 +0800
Tag:    v2.2.5

Merge branch 'MDL-28568_noncontact_warning_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit d5a81fadbf67d3c54372e330c32894f12644cafa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 12:25:04 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-19430' of git://github.com/rajeshtaneja/moodle

commit 3e23eb683886b9c4130f82c44324109b4da896df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 07:13:28 +0800
Tag:    v2.4.0-beta

Merge branch 'w30_MDL-34475_m24_saveondefault' of git://github.com/skodak/moodle

commit 5986099daaac9c3ca2d7cadd8800bbd78d7a8df5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 07:13:16 +0800
Tag:    v2.3.2

Merge branch 'w30_MDL-34475_m23_saveondefault' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 61e93a4c0832d6a9ea09dcf7d1775ef1b90f844f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 05:20:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-27083-master' of git://github.com/FMCorz/moodle

commit ea268875fb1398bacc71559283d2e1709799393d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 05:18:19 +0800
Tag:    v2.3.2

Merge branch 'MDL-27083-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 775673d4b16d311b27411772c9eb882da4da8143
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 05:18:06 +0800
Tag:    v2.2.5

Merge branch 'MDL-27083-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit b016e23594862dcd69bb3eca87e72296a2141d90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jul 2012 07:21:16 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34352-master-2' of git://git.luns.net.uk/moodle

commit 395b805f97caaf366aa5f4257f7133c11910e12b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 10:04:09 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34225' of git://github.com/nebgor/moodle

commit 9e50c8d1e7f2f9449d68f39ddd1b7afb07e9e891
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 09:39:11 +0800
Tag:    v2.4.0-beta

Merge branch 'w30_MDL-33180_m24_simpletest' of git://github.com/skodak/moodle

commit 4c21d0da952c65cacd4081d97221d05aa8592f60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 09:36:45 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-19430' of git://github.com/rajeshtaneja/moodle

commit 18989c7a24161b56bb42ff0ca79d7efab3fc77d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:52:35 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34205-master' of git://github.com/micaherne/moodle

commit df490747711683e8bbb672ac4fcfa332b25f6015
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:48:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-24298-master' of git://github.com/micaherne/moodle

commit 11946cada066c7e6457a7c584b80129c4b67b987
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:42:23 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34412_master' of git://github.com/lazydaisy/moodle

commit 4094913d5381dd3a17d3ed7c00d08749112a7090
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:42:12 +0800
Tag:    v2.3.2

Merge branch 'MDL-34412_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 97918ad5861802588e7a79c8bc06eedce914525a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:40:08 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34370_master' of git://github.com/lazydaisy/moodle

commit f945ffb908eaa58f6a1253c49c3ef915f1737831
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:39:59 +0800
Tag:    v2.3.2

Merge branch 'MDL-34370_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit dedf660f86f19a051d701b7bd4c34910bdbcfa87
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:37:40 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34428-master' of git://github.com/marinaglancy/moodle

commit a7b2d087270a93e65a51110738fbf1f8fea232b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:25:31 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33560-master' of git://github.com/FMCorz/moodle

commit 6fcebf2424df5169828d45d9f202ca6cc61d402f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:25:20 +0800
Tag:    v2.3.2

Merge branch 'MDL-33560-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 0fd928ddeb35a4476a856538b35a1a107d652aa0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:25:09 +0800
Tag:    v2.2.5

Merge branch 'MDL-33560-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 9d1594b04bf9f6e7ac497cad07d0afd9888514c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:19:58 +0800
Tag:    v2.3.2

Merge branch 'MDL-31516_grade_comma_decsep_moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_STABLE

commit fc994304a224ddaa29356b362c4666d5d553d8af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:08:15 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34221-master' of git://github.com/marinaglancy/moodle

commit 87608b34f497142475989f8f2197c690465b3ec1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:00:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33927_enforce_max_attachments' of git://github.com/davosmith/moodle

commit 6d8b85ff824ab9c9b3debf77c81a6831571b312d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:49:57 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29563_master' of https://github.com/dmonllao/moodle

commit 2372ccb77427adbfdcc17e8881a1f3f453956f97
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:49:39 +0800
Tag:    v2.3.2

Merge branch 'MDL-29563_23' of https://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 71268ddb625d110db3de4e8125d0a5182217fbbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:49:28 +0800
Tag:    v2.2.5

Merge branch 'MDL-29563_22' of https://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 4ad0926a30e46c96b479f86a03e6ff2aaf9cdaa4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:40:07 +0800
Tag:    v2.3.2

Merge branch 'MDL-34427' of git://github.com/jasonilicic/moodle into MOODLE_23_STABLE

commit f49eff005ed03aebe19ae3739c5983579ab72b50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:38:19 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-34374' of git://github.com/danmarsden/moodle

commit f315e3e184a3cabef6a3b7bc28b6d040769fed34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:38:09 +0800
Tag:    v2.3.2

Merge branch 'm23_MDL-34374' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 82bb3c039caa75a3409ee1aee4136804c0bf81e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:37:59 +0800
Tag:    v2.2.5

Merge branch 'm22_MDL-34374' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit ce4182a46a31ba48c2dbb9f0a1c75592bb3443af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:26:59 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-34233' of git://github.com/danmarsden/moodle

commit 93c3b29893f8c4d432d9f1501ebd06c680a2c99e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:26:50 +0800
Tag:    v2.3.2

Merge branch 'm23_MDL-34233' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 5e202b6cb4991990381f33cc85d2b107780b0c16
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:26:41 +0800
Tag:    v2.2.5

Merge branch 'm22_MDL-34233' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit c41e682c27d5e739db12ab3e749a771b84ae0db2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:22:17 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34313' of git://github.com/netspotau/moodle-mod_assign

commit 1d434a6d1703d1614ef8ca1fc3cdc3dd69f9bd13
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:20:28 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34272' of git://github.com/netspotau/moodle-mod_assign

commit 5b2b9e04ef45ed3044d76f2cb6155c26b34cfe12
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:09:28 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34256' of git://github.com/netspotau/moodle-mod_assign

commit d817a9e52e3724a4ceadbbc223fa1be4fdeeeea2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:07:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34067' of git://github.com/netspotau/moodle-mod_assign

commit f3a6fa396ee4256ed36061d66773a8767916f97b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 06:54:55 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-2283' of git://github.com/netspotau/moodle-mod_assign

commit 30a47aea87c74526510e440ae80650b043ebdf6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 06:39:56 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34265-master' of git://github.com/ankitagarwal/moodle

commit 28ea78bf7a6e8445bb6a5b4d52d78b7ed6988cee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 06:39:45 +0800
Tag:    v2.3.2

Merge branch 'MDL-34265-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 5f6c20bca20bfdbbfd2c1f5dd8cfabd3e6745588
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 06:39:30 +0800
Tag:    v2.2.5

Merge branch 'MDL-34265-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit d9416fba03ab5a7b772d99343ced86212b477738
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 05:43:17 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34322-master-1' of git://git.luns.net.uk/moodle

commit 8afee51adb95adf0dcf2bbcf5198d4c0c3165239
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 05:37:29 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34243' of git://github.com/srynot4sale/moodle

commit d7e0d2cb08158afedd9e9f6c6b1d0caa71b9f9ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 06:25:28 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31300' of git://github.com/rwijaya/moodle

commit e260e8ce571b3b97cafb78641f127cd88294db82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 06:19:52 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32948' of git://github.com/netspotau/moodle-mod_assign

commit 5f7ee647ff985cd7b5cab4049804c038354a6f4c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 06:12:50 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34217' of git://github.com/netspotau/moodle-mod_assign

commit 7ee23e554d5ebc3dfe0b6bf256bc01f8fda8d1e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 06:05:31 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31132-master' of git://github.com/ankitagarwal/moodle

commit 2fcd79c0437c58ac341dc8cd9615351e83aad3f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 05:41:42 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-21572-master' of git://github.com/FMCorz/moodle

commit 4d9f21a27e51f37150b990a41aa6b4af0ed0822c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 05:33:00 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33874-master-2' of git://git.luns.net.uk/moodle

commit c1483c9c6cb71de4d39eebf8b2dcdde735f26e0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Jul 2012 13:38:16 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32919-core_course_import_course' of git://github.com/jleyva/moodle

commit 51625c4662cfc4b102da496b6bbbf963ce0698e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Jul 2012 11:50:19 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33575' of git://github.com/rwijaya/moodle

commit 07cb7e3d34e31d44b0514d19949b73ba1a6d65b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Jul 2012 11:50:08 +0800
Tag:    v2.3.2

Merge branch 'MDL-33575_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit bff217f18b095e3dfc56912ceba41ba54fbf342a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Jul 2012 11:50:00 +0800
Tag:    v2.2.5

Merge branch 'MDL-33575_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 775d9777103b60b77fb8298e57d289d4dbec722b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 09:51:07 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33624' of git://github.com/danpoltawski/moodle

commit 5320640ccdde9a3c9790d26d39bf1068ef4fe46f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 09:50:56 +0800
Tag:    v2.3.2

Merge branch 'MDL-33624-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit f1cb47f9a38ec2a5cb193d86479f3afb5c57a9c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 09:50:48 +0800
Tag:    v2.2.5

Merge branch 'MDL-33624-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit ad882e0e4191e8dee5f0a3bbdd7e1b53bf6e226e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 09:44:58 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-34133' of git://github.com/danmarsden/moodle

commit 4208d297491ce01ee2daae6184fd3d28b4e0489b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 08:05:34 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34214_dndupload_preview_element' of git://github.com/davosmith/moodle

commit 5d827a7125a6b43c321df992f5b3455fa7a273f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:57:48 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-26145_master' of git://github.com/dmonllao/moodle

commit ac98ad6189d4da78bd738c69f3cdcd4a15dbf3a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:57:35 +0800
Tag:    v2.3.2

Merge branch 'MDL-26145_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 3c0d5ff61e1fa2aff35e0ea125bd896234e4115e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:57:25 +0800
Tag:    v2.2.5

Merge branch 'MDL-26145_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 78f15d33bb45c5f73d82daf1e6bc02b04f635617
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:50:35 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-28155_master' of git://github.com/dmonllao/moodle

commit 8f87d57c471596f6eac06a404987017b2f96ed75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:50:23 +0800
Tag:    v2.3.2

Merge branch 'MDL-28155_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit a9fb701ad52d7640e5ec68825704b9b3eaee74c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:50:13 +0800
Tag:    v2.2.5

Merge branch 'MDL-28155_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 2ec3484dbe2f89691402c35b5dd6a95e74ea386d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:01:09 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32310' of git://github.com/danpoltawski/moodle

commit 828a42c37d7c5a623975e91b3d5a048b0f5a8979
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:00:57 +0800
Tag:    v2.3.2

Merge branch 'MDL-32310-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit aa83dea5e81860276188223c56a50bab5d17fb72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:00:49 +0800
Tag:    v2.2.5

Merge branch 'MDL-32310-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 0cc403cbe6138f3122ec15aa910c6c7617c525a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:49:57 +0800
Tag:    v2.2.5

Merge branch 'MDL-33917-2' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 7bac687d55a3e41b99d586aeda65a45d1197c742
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:44:11 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34153' of git://github.com/danpoltawski/moodle

commit d479ce3bef1b3596c2b220970cc9a5c5da5ce462
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:44:01 +0800
Tag:    v2.3.2

Merge branch 'MDL-34153-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit b0965de5883f374e4ab0e7a418d60206c00cf273
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:37:53 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34240' of git://github.com/danpoltawski/moodle

commit f30998190f81c4555ee11da98dc4306ee491401f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:37:42 +0800
Tag:    v2.3.2

Merge branch 'MDL-34240-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit cbbdc7db2ae2f8d724ebb8f48a08bb730a986a76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:35:34 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-32228_add_plagiarism_api_support_to_online_assignment_type' of git://github.com/kanikagoyal/moodle

commit c9f6b1af5d232bd2d4b276b06fd62b0d8423de42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:25:36 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-32229_add_plagiarism_api_support_to_forum' of git://github.com/kanikagoyal/moodle

commit ff8ab720f05d48af3ddaacd51ed34ab86ebe06b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:10:54 +0800
Tag:    v2.3.2

Merge branch 'MDL-34072' of git://github.com/appalachianstate/moodle into MOODLE_23_STABLE

commit c6e94095be03da8e464ab889f95af0e4cc5051f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:57:45 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34258' of git://github.com/netspotau/moodle-mod_assign

commit 5c4907e987826c16b85b510f5e2afa155c076419
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:39:22 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-27563-master' of https://github.com/mackensen/moodle

commit 5b5745daa3285bbf9e3abb80c31667b89db8fd64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:35:24 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33841-master' of https://github.com/barbararamiro/moodle

commit 11f8318ccc8ff1d1176b3821ff391a2763d8cc83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:25:21 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33874-master-1' of git://git.luns.net.uk/moodle

commit 8fcf6d22bd6b51742c2bcb36426a3ef5fbeb0b9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:18:56 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33788b' of git://github.com/srynot4sale/moodle

commit bac907035929bb49d7ffe9050a898c0c621d2f89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:18:46 +0800
Tag:    v2.3.2

Merge branch 'MDL-33788b-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

commit 9f55156eb484e52710479b19eb94616947ee1394
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:18:36 +0800
Tag:    v2.2.5

Merge branch 'MDL-33788b-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit f163de5a8ccb9058f3286b4956332626b3cd7e75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 12 Jul 2012 14:24:36 +0800
Tag:    v2.2.5

Merge branch 'MDL-32297-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 37038fa8e1e57576727b89634c593a1493954e5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Jul 2012 07:33:02 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-33753_m24_utfunzip' of git://github.com/skodak/moodle

commit ee2b82d8cb8bd8a92077d6123f91c504c45602c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Jul 2012 07:27:48 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-33710_m24_utfzip' of git://github.com/skodak/moodle

commit f0d6e53c11ae1b568c14129e5633c6b2e9e43db9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 11:47:33 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-33617_m24_roleenrolindex' of git://github.com/skodak/moodle

commit e9c614276bb16447eb3a8c50f4a8b25aef61ff82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 11:26:58 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34237' of git://github.com/danpoltawski/moodle

commit af0c360f48b4777d900a23816237a1e755ac944b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 11:07:47 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-33887_m24_jsstrings' of git://github.com/skodak/moodle

commit e977b391b7a2e74ff83ddf2f142b1e18a6f54adc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 10:50:40 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-34057_m24_styledebug' of git://github.com/skodak/moodle

commit 8f19a9430451f49cb1509d6d17af2f73d4e747a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 10:42:28 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-34101_m24_newaccountprev' of git://github.com/skodak/moodle

commit 2e87278cbd6c2da54e09faf68c5e9c62da341eb1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:51:50 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-34155_m24_visibilitydefault' of git://github.com/skodak/moodle

commit 1ef3f066ee3e041d76d53a63ac7658bb0e5f0d75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:43:48 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-34175_m24_admin' of git://github.com/skodak/moodle

commit 3ca82ed605b69847456b62da482950ee9482ecef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:43:42 +0800
Tag:    v2.3.2

Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 3bfe07a5adc7adf0e3ffc2264bad4219b34fd8d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:27:47 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33444-master' of git://github.com/marinaglancy/moodle

commit 77c3ccccd235623bac3205465d8beab971dceb7b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:22:19 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-34139-master' of git://github.com/marinaglancy/moodle

commit 3ea910c83f200f8a204483da74e6af02346c9113
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:16:26 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-33454_m24_tinymce3541' of git://github.com/skodak/moodle

commit 5958b17eb0400655b0215d3df8075dfa67f951d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:13:03 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29470-master' of git://github.com/FMCorz/moodle

commit bd75b67885fa7e0317fed9961f36f9f71a6b7be3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:09:26 +0800
Tag:    v2.3.2

Merge branch 'MDL-29470-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 714f2d590a322cb1d4d84c0d1d6d085f14000af4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:09:14 +0800
Tag:    v2.2.5

Merge branch 'MDL-29470-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit c54cd379ac317dfa325fbc170f57b6887bad2c22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:09:06 +0800
Tag:    v2.1.8

Merge branch 'MDL-29470-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE

commit 730ff61856b2a64f60c2b3804cdfb2b81507f83d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:05:42 +0800
Tag:    v2.2.5

Merge branch 'MDL-32297-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 3936796042e10982e78a2705560b154c378a5770
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:05:33 +0800
Tag:    v2.3.2

Merge branch 'MDL-32297-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 3aed38eb7dde8931f71ec7bda9c3152c27158b81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:03:00 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32297-master' of git://github.com/FMCorz/moodle

commit 3b37c5ceb9fc2d2ccd14b6be767fa86b1b2ad6c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 07:47:20 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34107_filename_dot' of git://github.com/davosmith/moodle

commit 0f36bce51edc366730e813521673144382da69b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 07:40:18 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34061' of git://github.com/danpoltawski/moodle

commit 68a5f9c7ab4915d6a5a2997ec12034e0b3aff443
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 07:32:09 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-27800-23' of https://github.com/mackensen/moodle

commit 357f4d8ed7dabbaa34b86bd9573203dd40b69b6a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 13:24:13 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-33822' of git://github.com/danmarsden/moodle

commit 0e08cd1ffd4b390f457cb7903297a63c079ba5fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 13:19:19 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-17395' of git://github.com/danpoltawski/moodle

commit 3c34f3213f97348d1332ef2379614bad84fd6b13
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 13:14:08 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33795-master' of https://github.com/barbararamiro/moodle

commit 46bc0e2238349dc58d8f88e1055eee0c2e0f3dc4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 12:27:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33702-master' of git://github.com/ankitagarwal/moodle

commit a2a2e7fb4a2cd8bb23eebc72dbb6b4392a86d010
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 12:01:54 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32119' of git://github.com/srynot4sale/moodle

commit 871c06e583d03e12d85a59f845303dfb74b13e79
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 07:44:39 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29538_usercond' of git://github.com/markn86/moodle

commit 5261dab607dca1f9f0da949bf38981c253f49cba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:45:14 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-30816' of git://github.com/rwijaya/moodle

commit 9bf1621fbc3e117493d92ac226c897a6d1b7c98f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:28:45 +0800
Tag:    v2.3.2

Merge branch 'MDL-30816_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit df4066677524729402f73fce9279a92603032c56
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:28:37 +0800
Tag:    v2.2.5

Merge branch 'MDL-30816_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 5c89dd5d186f1f0d2d9e49296c4fb7e00d004299
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:28:26 +0800
Tag:    v2.1.8

Merge branch 'MDL-30816_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 8e7d4f331720566f8d1c62d5459106363295b0e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:24:23 +0800
Tag:    v2.2.5

Merge branch 'MDL-33514-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit ece157e42625eece5cdcd5af66c08344e885e0fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:22:06 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33514' of git://github.com/danpoltawski/moodle

commit 67fb1b666e10af499a6b5b4d0178397857a02adc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:21:47 +0800
Tag:    v2.1.8

Merge branch 'MDL-33514-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit 91448b9db20a22371539be017aae011f7d6a1e0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:19:50 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31033_message_deprecated' of git://github.com/andyjdavis/moodle

commit 6ff9f8404cabe6e830bd5e7bc252aa53ba058b41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 06 Jul 2012 05:50:41 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit ce70f9d0f71360b4b55ec4e1fa7196798197f476
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 06 Jul 2012 05:49:32 +0800
Tag:    v2.2.4

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 0ac34abbfbdc1847c9121bae3b3efd675072bafe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 06 Jul 2012 05:49:24 +0800
Tag:    v2.1.7

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 453e17a1595da026eeafcae2a63ab02a85cfbee7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 06 Jul 2012 05:47:50 +0800
Tag:    v2.0.10

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 5804a2a31e69e12eae3ccd5a0c76c396ea75c2de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 09:30:58 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32614' of git://github.com/stronk7/moodle

commit 6019d2b2f304728e86a3f4e26f9978b48b339129
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 09:15:03 +0800
Tag:    v2.3.1

Merge branch 'MDL-32614_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit e0c7cb6ffa8b3a85484368c381e770c8536c5492
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 09:14:48 +0800
Tag:    v2.2.4

Merge branch 'MDL-32614_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 3778f990ccb0e3e514d5dd698c73294ed690f802
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 06:07:54 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31692' of git://github.com/danpoltawski/moodle

commit 74abe5ce15c372e4e4042eaabc48d447609a73f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:54:06 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32062' of git://github.com/timhunt/moodle

commit 848fc30a2d2835fb1260348715818a475bac5bfb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:53:51 +0800
Tag:    v2.3.1

Merge branch 'MDL-32062_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit c0c6e7966e62fbefefce4504d23818fa92678adf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:53:40 +0800
Tag:    v2.2.4

Merge branch 'MDL-32062_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 7d7f36787bf1bddfd7a0f59a94b41882e31f3583
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:53:32 +0800
Tag:    v2.1.7

Merge branch 'MDL-32062_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit dcce2171604e77299480c200cbe90fc3ff3ce09f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:42:30 +0800
Tag:    v2.2.4

Merge branch 'MDL-32851-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit dc31e8d73d72f4fe5c74f45694ce5eaaf58873d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:37:38 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33466-master' of git://github.com/sammarshallou/moodle

commit c425663c4c97ad0523335923fc7851712f2799f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:32:45 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2

commit 17a759cf6111484291f3c77e4ae05efdffc17e57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:41:26 +0800
Tag:    v2.1.7

Merge branch 'wip-MDL-33749-MOODLE_21_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_21_STABLE

commit 5439f90aa3f39180550a59a6ccf7337da58a0131
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:33:14 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33749-master' of https://github.com/kwiliarty/moodle

commit 941d1fb2ccb068d89cc3c6f1b7173ea2bae19d04
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:26:14 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-mdl-32787' of git://github.com/rajeshtaneja/moodle

commit 7df86db31d74401955670dd8cdfa020cfbf2bcf5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:26:03 +0800
Tag:    v2.3.1

Merge branch 'wip-mdl-32787-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 56861454c1cf2be10bf5f146b3d78973c53e3cff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:25:46 +0800
Tag:    v2.2.4

Merge branch 'wip-mdl-32787-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit e537a588d8c5a06037f717ae403b9e4040e20df3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 12:35:32 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33828-master' of git://github.com/FMCorz/moodle

commit 0afd953daf021be08db1ada2c405c95ea76d6b4c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 11:15:18 +0800
Tag:    v2.3.1

Merge branch 'w27_MDL-34115_m23_arrayofarrayssort' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 78e43b866b0a8782452d30e42329a264b1dc8bf3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 11:15:07 +0800
Tag:    v2.4.0-beta

Merge branch 'w27_MDL-34115_m24_arrayofarrayssort' of git://github.com/skodak/moodle

commit 04573eaa650a7cd45352959dcb04746e513abf2e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:57:41 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33957-master' of git://github.com/phalacee/moodle

commit 06a3ab6c0b82b2fff17d3d7fca25761e10f6a300
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:57:23 +0800
Tag:    v2.2.4

Merge branch 'wip-MDL-33957-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 30cab618e1c51b992b4215fe6191b9ab744277f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:57:14 +0800
Tag:    v2.1.7

Merge branch 'wip-MDL-33957-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit 73d38068d924f0d3da82e983488dd1b139a9392b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:14:31 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33987_master' of git://github.com/lazydaisy/moodle

commit 10ff22d6f67870c4089a540c1868c57598badfdb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:11:40 +0800
Tag:    v2.3.1

Merge branch 'MDL-33987_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 2da0a383980c34fdb6448fb142a1fd90f4a72234
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 07:48:43 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33770' of git://github.com/mouneyrac/moodle

commit b16832db0d70ce2a343de356e9dbfa79efaf89f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 07:48:16 +0800
Tag:    v2.2.4

Merge branch 'MOODLE_22_STABLE-MDL-33770' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 75aa150051eb95cedde699102d3af1e8c86124a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 07:47:58 +0800
Tag:    v2.1.7

Merge branch 'MOODLE_21_STABLE-MDL-33770' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit e1d7771b0f0c07f3ec039a7e603e1fbdce7dc7c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 07:36:01 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33814-master' of git://github.com/FMCorz/moodle

commit 4f5263d969061409c9ab78299715cfaecf747873
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:55:29 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34029_upgrade_documentation' of git://github.com/davosmith/moodle

commit 14cff7be4d3e2f0e9932db85f32e478804392b68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:47:07 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-9214' of git://github.com/danpoltawski/moodle

commit c6c16fd9ea2506113279c746e74b88d8919cfaf2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:41:17 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32286' of git://github.com/danpoltawski/moodle

commit b624ae9a2bc7947d342d4fac1a14aa693c7d1f1f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:36:57 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33990' of git://github.com/danpoltawski/moodle

commit b5c4f3042ba839597b0551fd904c81f850bc7112
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:32:37 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34014' of git://github.com/danpoltawski/moodle

commit 457fc727acd13ee86a55c013f74f31e2541528e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:30:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34022' of git://github.com/danpoltawski/moodle

commit fc8931e4575a59db8403aaf7839d8058eba31cf7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:27:16 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34033' of git://github.com/danpoltawski/moodle

commit a0c400598ee1ad23b8bca11b7743d0f5c98463be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:20:56 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33848' of git://github.com/netspotau/moodle-mod_assign

commit a8d40508e9c1a7265bee2e012ab7d4865e39feb1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:13:12 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-28151' of git://github.com/danpoltawski/moodle

commit 30141a875e3fe3608d992ac1df7b9df5455c781e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 05:42:08 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-23254' of git://github.com/nebgor/moodle

commit 103a53473f4b02601dbdc1c35c553e97aa464a76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:53:31 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33686_options' of git://github.com/andyjdavis/moodle

commit e07a3bf209ddcef1d3d1b5cbd598ce845931b314
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:31:55 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33932_master' of git://github.com/grabs/moodle

commit 461499b836058b968db70e45ff713302dabb3d6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:31:43 +0800
Tag:    v2.2.4

Merge branch 'MDL-33932_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 40f00ad784d6ca83abd0706bfdc10e2e1f62e017
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:31:32 +0800
Tag:    v2.1.7

Merge branch 'MDL-33932_21' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit ba22fd2f1b89afb50ab47d5417a3cf2f8a12851f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:31:11 +0800
Tag:    v2.0.10

Merge branch 'MDL-33932_20' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit bbfa552c7b5bacf11cf706183c1de84c3983d836
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:06:14 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33627_master' of git://github.com/grabs/moodle

commit 803122e110a09bf482c65212b2176b0aaf663701
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:05:57 +0800
Tag:    v2.2.4

Merge branch 'MDL-33627_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 45181b1553aafd9423a40f030eae9dd67b6c8d14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:05:42 +0800
Tag:    v2.1.7

Merge branch 'MDL-33627_21' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit b7ab2a33f93bf0374f6aee68fc08880fd097b7c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:05:25 +0800
Tag:    v2.0.10

Merge branch 'MDL-33627_20' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit abb98b88815d61fc5e5d5a7e6f7bbd540d5dcc8c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:45 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34044' of git://github.com/srynot4sale/moodle

commit 4be710795af8d143074f81111307580288a6770c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:35 +0800
Tag:    v2.3.1

Merge branch 'MDL-34044-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

commit 1d2b991046ced8bb85f6e6d0d29ba966797f3ccf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:26 +0800
Tag:    v2.2.4

Merge branch 'MDL-34044-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit e2f3b1eea1a6487c64fdecbe62ab92a6e88fb879
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:10 +0800
Tag:    v2.1.7

Merge branch 'MDL-34044-21' of git://github.com/srynot4sale/moodle into MOODLE_21_STABLE

commit 31ea84a5034731ba5bbaa8aed87b59fcac628f74
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 10:40:09 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-32769-master' of git://github.com/ankitagarwal/moodle

commit cc0823118decfb4f94aea2265ecfa23c3f2dac93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 10:25:54 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-MDL-33931-master' of git://github.com/abgreeve/moodle

commit 088c374a6d306f4bbb0ad26c099e29c4be645a23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 07:56:49 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33430-reference-restore' of git://github.com/mudrd8mz/moodle

commit a273391e4acac0c4a8458d25ada52e15bfcbd49d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 05:47:13 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33936-master-1' of git://git.luns.net.uk/moodle

commit c691963939655c65eb418e82715eea6c4d3d2197
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 05:33:25 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-MDL-33928-master' of git://github.com/phalacee/moodle

commit c5541daf00fc14d7a8a1e16cc318aa0ea4565b40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 05:02:50 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33915' of git://github.com/danpoltawski/moodle

commit 42fe1f5e073bfce177e732abcd92034e17567db0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 07:38:45 +0800
Tag:    v2.0.10

Merge branch 'MDL-27675_20' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit a4c4e43a5f7476ea3c823caa7671d1739c8a8bae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 07:36:42 +0800
Tag:    v2.1.7

Merge branch 'MDL-27675_21' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit b917d504a3a2ca7fb294d38f298fe80d02308aa8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 07:29:32 +0800
Tag:    v2.2.4

Merge branch 'MDL-27675_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit d2448b8bd2994c6832d926996a836ead1b318e20
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 07:25:07 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-27675_master' of git://github.com/grabs/moodle

commit 92e084297819a7bd41945aacb0c50e716529372e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 06:19:05 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33808' of git://github.com/danpoltawski/moodle

commit 217926aaa14fb672e8eb2c660637cca87dfbf402
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 06:06:32 +0800
Tag:    v2.2.4

Merge branch 'MDL-33808-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit d25f6b810490fb3e4b5ba82e80d0fdbb47fea187
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 06:06:24 +0800
Tag:    v2.1.7

Merge branch 'MDL-33808-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit 21cb669f36dcdbd094815d69f6c3ff712455276b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 06:01:49 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33845_folder_whitespace' of git://github.com/moodler/moodle

commit 45d011c896936e843e1f9f3f96b7df9b0f5f9e5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 05:46:32 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-32479_master' of git://github.com/lazydaisy/moodle

commit f7dc4a56303c983d9dec28475c07abcf5076be57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 20 Jun 2012 07:39:59 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-3971' of git://github.com/danpoltawski/moodle

commit 1e3d84785a315d09b1642c45d32b7f807e7868df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 20 Jun 2012 07:32:04 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-mdl-33425' of git://github.com/rajeshtaneja/moodle

commit a9efc8ddb8ac00e0d195c80bb8d07a2e293039aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 20 Jun 2012 06:31:52 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-32908' of git://github.com/danpoltawski/moodle

commit ec1ca38996bc1b336cbc35fe43b5ff6b4660ccae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 20 Jun 2012 05:36:22 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33843' of git://github.com/netspotau/moodle-mod_assign

commit dae0c90dbd443df9fda1d377c489f1eb56fe2dcf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 20 Jun 2012 05:15:48 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-mdl-33506' of git://github.com/rajeshtaneja/moodle

commit 778121751d6fa791aebb1a7e9f6bdb02511e21be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 14 Jun 2012 12:37:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32767' of git://github.com/danpoltawski/moodle

commit 78338b8b0e4eae09fe434223d8db0a67d9a11df8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 14 Jun 2012 07:31:46 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33645-master' of git://github.com/ankitagarwal/moodle

commit 043a53fb25fed46db66b7737f7f8e782de475ad5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 14 Jun 2012 07:27:37 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33541' of git://github.com/danpoltawski/moodle

commit f90848689c40b55b221061ad9ce7170bb0cfbbdf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 14 Jun 2012 07:20:16 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33554' of git://github.com/mouneyrac/moodle

commit 463ccee1de56e39fadfa56b88fdbd7b9262f4bf7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jun 2012 11:40:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33128-master-1' of git://git.luns.net.uk/moodle

commit a54a08b818ba46679f148e3bc11f2afc1a784d04
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jun 2012 11:32:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32573' of git://github.com/danpoltawski/moodle

commit 7cbd6d8353f3c9713ac5102cee2e72bc80e92719
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jun 2012 11:24:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33675-master-1' of git://git.luns.net.uk/moodle

commit c224cc643b8a03b2245eb2495fbffb7cb51bb9cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 07:53:43 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-33557_m23_initpath' of git://github.com/skodak/moodle

commit 76cc4fd17785117036b68bd71ddde164ecb13895
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:23:16 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33080' of git://github.com/stronk7/moodle

commit 29515af1d8c917e5f1e42c82ed94e41182a0989c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:23:04 +0800
Tag:    v2.2.4

Merge branch 'MDL-33080_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 5874cc6aabcc2a15a9c4e6db0c4c3b8d82f39c9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:20:43 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32325-master' of git://github.com/FMCorz/moodle

commit 52b6c9bc01df1fad656cf352e336c3c3b9f3468e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:20:37 +0800
Tag:    v2.2.4

Merge branch 'MDL-32325-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 54e24c11a59f213c65dfe8d06ee5e9ea76bcc1a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:20:31 +0800
Tag:    v2.1.7

Merge branch 'MDL-32325-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE

commit a509cb29c30749ec37a329cd08b111b351bf5f1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 05:04:46 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30506' of git://github.com/jonof/moodle

commit 5dc4db1ef2596f0779c10dcc714e06d9e3ae218d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 11:37:43 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33090-missing-xmldb-strings' of git://github.com/rlorenzo/moodle

commit 50eb136630921c907498495ba65ae5d7145146be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 11:37:28 +0800
Tag:    v2.2.4

Merge branch 'MDL-33090_22-missing-xmldb-strings' of git://github.com/rlorenzo/moodle into MOODLE_22_STABLE

commit c2cf907f3f5c58cd0e860dc2c85501724f0d60ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 11:24:03 +0800
Tag:    v2.1.7

Merge branch 'wip-mdl-33090-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit e5b200cd65c2de2d5101fb766df3a25118fb17e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 11:19:49 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-33367' of git://github.com/rajeshtaneja/moodle

commit f064f0fd15a23f35ce50f2a12d91c9aaf5149a26
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 07:50:19 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-33103_m23_dataestrict' of git://github.com/skodak/moodle

commit 9897974b8227d8c4743083484be091fa3bcde6bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 07:43:47 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33511' of git://github.com/danpoltawski/moodle

commit 1236d15b0e9bbd04454b4a0b29100a673843328b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 07:13:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33528' of git://github.com/mouneyrac/moodle

commit 4744851197f5e39eadb2cb803261b4edc5f51d55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 07:00:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30837-master' of https://github.com/FMCorz/moodle

commit 57dd3c69097ce4bbecdbc4b6ac31bc92400af2e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:59:43 +0800
Tag:    v2.2.4

Merge branch 'MDL-30837-22' of https://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit bed0c7a63ef8ed93b8f55095fa0ccb4383a25c39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:59:34 +0800
Tag:    v2.1.7

Merge branch 'MDL-30837-21' of https://github.com/FMCorz/moodle into MOODLE_21_STABLE

commit 4c3a1c6f8a6e08d921d91d8ee5592a31d0b2de70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:37:48 +0800
Tag:    v2.1.7

Merge branch 'MDL-31520-MOODLE_21_STABLE' of git://github.com/fabiomsouto/moodle into MOODLE_21_STABLE

commit 65d7459b6d50c542a3493ee566bd72f02645c20a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:37:36 +0800
Tag:    v2.2.4

Merge branch 'MDL-31520-MOODLE_22_STABLE' of git://github.com/fabiomsouto/moodle into MOODLE_22_STABLE

commit fd200bc5e548f576fc5dcf89dd5ed6720fb34c88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:33:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31520-master' of git://github.com/fabiomsouto/moodle

commit 6a27fc8b341d77ca488c34a834ec0cacd7d40623
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:25:06 +0800
Tag:    v2.2.4

Merge branch 'MDL-33353_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit dd9e2c8d444b614ad6823d5b634be5546d8e872b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:18:43 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33503' of git://github.com/stronk7/moodle

commit 447ebaa90ee7f4437f62f78a550132ebcb9d517b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:14:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31823_master' of git://github.com/dmonllao/moodle

commit 9331c1ec8c47c75b72f3cf2d956de52a6d3ecaca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:13:39 +0800
Tag:    v2.2.4

Merge branch 'MDL-31823_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 8ad117cca866e4d3385ddaa211f12cbb96098207
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:13:32 +0800
Tag:    v2.1.7

Merge branch 'MDL-31823_21' of git://github.com/dmonllao/moodle into MOODLE_21_STABLE

commit 4ed1657f3e983574bc61443b40d8bdfa1c4cc5ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:10:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33441' of git://github.com/danpoltawski/moodle

commit 46d433f7011dcfbeae3c9fcbdd54adbcb83556f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:09:54 +0800
Tag:    v2.2.4

Merge branch 'MDL-33441-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 7d4c5ac5ab77d729362563576d5b83d5bd0faa4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:09:45 +0800
Tag:    v2.1.7

Merge branch 'MDL-33441-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit f48de74428dea179464879b47e7c3dece0b065bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:06:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33487' of git://github.com/danpoltawski/moodle

commit 928a51ad3d6b3877ca9b38975415e1089263bc60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:06:05 +0800
Tag:    v2.2.4

Merge branch 'MDL-33487-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit ded3134c3766bb7b7f03ac7f52e2caab2b91d000
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:05:57 +0800
Tag:    v2.1.7

Merge branch 'MDL-33487-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit e8a20ce85a2a2aaa17fbba65e78f306085d9411c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:07:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26277-master' of https://github.com/mackensen/moodle

commit 042ae10e1d1ea797d160498e6dbbe566ab981a38
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:07:17 +0800
Tag:    v2.2.4

Merge branch 'MDL-26277-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit bc1f0e0b405ffc75a96a67b11e429a41c1d34ead
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:07:07 +0800
Tag:    v2.1.7

Merge branch 'MDL-26277-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

commit 2c7a72df06244f019bbeac5b424e81da1e848a57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:05:04 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33369-master' of git://github.com/ankitagarwal/moodle with changes

commit b576a97554966b4fd7dd5d135f531eb90caff776
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 04:54:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33031_master' of git://github.com/kordan/moodle

commit 7df271d9b3541a2ed07010fa11e78a70c3594acf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 04:51:11 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27559-master-v2' of https://github.com/mackensen/moodle

commit 5deaa764ba905ba3ffd3b83f853c223d0c9334e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 04:30:02 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33056_dnd_status_bar' of git://github.com/davosmith/moodle

commit 84ec16a86128efe87a28daeb7f0c9c7cd03b3755
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 01 Jun 2012 09:42:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle

commit 6fbe06e530ed5b27843b99ffb20457db0679411b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 May 2012 11:26:27 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33385' of git://github.com/netspotau/moodle-mod_assign

commit bd633dda9a7ed63ad427761fe3b64d98d2030eba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 May 2012 04:49:29 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28949d' of git://github.com/srynot4sale/moodle

commit bdb315cca269d3672e5dac589451375dd443b6e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 13:05:10 +0800
Tag:    v2.3.0-beta

Merge branch 'w21_MDL-32972_m23_avatargifs' of git://github.com/skodak/moodle

commit a2aba3f612f24c141e2a4230eebcb0baad0bb5cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 12:50:46 +0800
Tag:    v2.3.0-beta

Merge branch 'w21_MDL-18763_m23_avatar512' of git://github.com/skodak/moodle

commit d8a05d83b5fa2e6d999c9831b171c1439b33c5bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 10:56:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32752-master-1' of git://git.luns.net.uk/moodle

commit 681789b4c192f8dadecf72f208c8ad14d0534fd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 10:52:47 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33331-master' of git://github.com/micaherne/moodle

commit bb0eaec4907f92215e6b5005b81c74a52767cf67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 10:49:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle

commit 9757d47ebfd99837fda620aa22c1107986032e6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 10:07:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33084_strict_calc' of git://github.com/andyjdavis/moodle

commit d9ce6f6442d87b91e33048f8f4e5294b382d21af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 10:03:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32380_master' of git://github.com/kordan/moodle

commit 48cb6e0b1cd521cbfaf568fbe46950fa95e9aa08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:51:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33364' of git://github.com/stronk7/moodle

commit 5a3f6eb468de6a4c27daecc10693bdf5e3fd77e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:51:09 +0800
Tag:    v2.2.4

Merge branch 'MDL-33364_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 27ee2b673775dc736f87c2974b2d286a0e726c76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:51:01 +0800
Tag:    v2.1.7

Merge branch 'MDL-33364_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit a09a9be81210a29a0c093ff34dc5685c86b84022
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:37:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle

commit e5d6cd54616007b5593f7833b001fd51fa94136c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:44:18 +0800
Tag:    v2.2.4

Merge branch 'MDL-27675_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 9c96488ed967a5923fd082ab9b30cab9409f99ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:44:07 +0800
Tag:    v2.1.7

Merge branch 'MDL-27675_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit 08e0aaa1733489cee61b1c48e166a98ada4477cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:22:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33191' of git://github.com/lazydaisy/moodle

commit dcd5d0840bc288e09b60225bb5d7e57805518640
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:21:58 +0800
Tag:    v2.2.4

Merge branch 'MDL-33191_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit b22884274f8e7729c5a9145b3b355fb1d4b03527
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:21:45 +0800
Tag:    v2.1.7

Merge branch 'MDL-33191_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit c31081d0a46d4c8a89d61dc99a6f47d994e2f3ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:19:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle

commit c994797ea9d6f03d535ebc50e2fbe2608661b371
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:12:36 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33120' of git://github.com/stronk7/moodle

commit 63f2813497ef91762976208a06bc23f0888ff02a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:04:43 +0800
Tag:    v2.3.0-beta

Merge branch 'dev_MDL-33147_transaction' of git://github.com/dongsheng/moodle

commit 7824c9d820b0e080a4069626068af7683875bd0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 06:52:24 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33325-master' of git://github.com/ankitagarwal/moodle

commit d48f4d2f75eebe5ce235b5cdeaa2983ccd7a44c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 06:52:12 +0800
Tag:    v2.2.4

Merge branch 'MDL-33325-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit ab833c6ee4634cf67bd688eeb7780267c58cf013
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 06:52:03 +0800
Tag:    v2.1.7

Merge branch 'MDL-33325-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 3d1e457e3e69961942fcbb4bdc69e4be886415e3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:48:40 +0800
Tag:    v2.2.4

Merge branch 'MDL-32203c-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit cd7963eabd5fed361f5ffc03d77f7c61fd522935
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:42:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32203c' of git://github.com/srynot4sale/moodle

commit ebbf509960fcb0c53d2b39d2fae551d2711c5c9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:23:59 +0800
Tag:    v2.1.7

Merge branch 'MDL-32203c-21' of git://github.com/srynot4sale/moodle into MOODLE_21_STABLE

commit 8dd37f1f6986ccd3521fa0f2467555539620e3aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:11:13 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33189-master-1' of git://git.luns.net.uk/moodle

commit 119e228621d7cb3d7a817599fba6089b3d99133b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:00:09 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26562-23' of git://github.com/vadimonus/moodle

commit 05ceae9bb2e12dbf52d210b299bbd9f38e3c3bd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 06:56:16 +0800
Tag:    v2.2.4

Merge branch 'MDL-26562-22' of git://github.com/vadimonus/moodle into MOODLE_22_STABLE

commit e09266d176f1af06d2614333c957f68e77750c7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 06:56:06 +0800
Tag:    v2.1.7

Merge branch 'MDL-26562-21' of git://github.com/vadimonus/moodle into MOODLE_21_STABLE

commit cba59b3d832fc7af00bf41a4d1eff8ae7c64bd4d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:49:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32204-mnet-auth' of git://github.com/mudrd8mz/moodle

commit 3e11be405b25ebef9fab1413634a5f76dc21f902
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:49:23 +0800
Tag:    v2.2.4

Merge branch 'MDL-32204-mnet-auth_22' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit d7bce7db814d03a326128c4174b94468382a7e64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:49:07 +0800
Tag:    v2.1.7

Merge branch 'MDL-32204-mnet-auth_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 0b02faa076803e40613788396202691afcc94c6a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:40:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33051' of git://github.com/danpoltawski/moodle

commit 4f4476081f1de47d4f991e95921350b0cd595de3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:31:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33055_master' of git://github.com/kordan/moodle

commit c5b8ae0eb7ffa63bbf661684491f2ddeefde01b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:21:41 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32932' of git://github.com/netspotau/moodle-mod_assign

commit ad5d189c93337da12cdf3a8c9c7c1ee0b98233ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 07:38:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33118' of git://github.com/lazydaisy/moodle

commit 4c32b79957884e468d4e1e7f5917120a3e140acf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 06:54:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33122-master' of git://github.com/ankitagarwal/moodle

commit 25bea62d331cc1acbcc4a9040a5425a0877c694d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 06:49:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33137-master-2' of git://git.luns.net.uk/moodle

commit d5e6fe3ecc99321f743be2d62a9acf888a9130f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 18 May 2012 12:07:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32727' of git://github.com/timhunt/moodle

commit 67cfce024524c0f7635466edb88d85b781fa6b42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 18 May 2012 06:48:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33069' of git://github.com/danpoltawski/moodle

commit 2bdafb867a130b989899dd424578c921f767bfc3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 10:55:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle

commit b9453253390af24dcd4f8c56daa6869b0cb7f83e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 10:49:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31850-master' of https://github.com/mackensen/moodle

commit e76f4039b98a1c7697443e5bc1e4a4e9dad58036
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 10:42:10 +0800
Tag:    v2.1.7

Merge branch 'MDL-29399_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 72f19573931c9a2e7969d351021706a1b321b7cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 10:24:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32903' of git://github.com/netspotau/moodle-mod_assign

commit 1220843c0230746acee87f0a32abdf671b19fc64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:30:44 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32610-hide-updates' of git://github.com/mudrd8mz/moodle

commit bcc52e748ab69c77b7b516352f4fc774e78e707c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:27:50 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32794' of git://github.com/danmarsden/moodle

commit 843599ae8611fd3d512002a2aa38c4956834ff6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:27:37 +0800
Tag:    v2.2.4

Merge branch 'm22_MDL-32794' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 2dfeb89f48fc68c241033a024aafabdc111f42b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:27:17 +0800
Tag:    v2.1.7

Merge branch 'm21_MDL-32794' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 536e3203e71650739af672f210fa1bb14ebb4faa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 07:54:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32904' of git://github.com/netspotau/moodle-mod_assign

commit 333127136a980a999c12a1e024abc8c72e6d72b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 07:53:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-23016c' of git://github.com/srynot4sale/moodle

commit 7b06151288072f0b9e6f02af5935ca54add0aa30
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 06:55:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle

commit 19d1525f6b4065824b3e48479e33cf407bc16f94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 09:14:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32641-master-1' of git://git.luns.net.uk/moodle

commit ba94f1d503cf306d88b8f4a7b73aeae6def4df0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 09:09:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle

commit a5bf3c520fda24b3e4cd5f7819dd064fcca870ee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:59:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31215-master-11' of git://git.luns.net.uk/moodle

commit fdbd219b33d7364feaaf8b830be553898ee0c8be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:51:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30434_debug_exception' of git://github.com/andyjdavis/moodle

commit 3cb5b9ccf6293992f5714093309b95c880901688
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:12:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31458' of git://github.com/danpoltawski/moodle

commit f97184b9c9ad1ced09047a8344c451b18753309c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:12:06 +0800
Tag:    v2.2.4

Merge branch 'MDL-31458-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 25f8be6e70b4f35a7d1c69afd3ddce2ee0ea547a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:11:59 +0800
Tag:    v2.1.7

Merge branch 'MDL-31458-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit dfb597b447e0061776a6ddb7ec017daf4400636d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 11:36:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31134-master' of git://github.com/ankitagarwal/moodle

commit 86558590a46d854852b47bb6517c4183c220d078
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 10:52:10 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31944' of git://github.com/ankitagarwal/moodle

commit edd25271c4c852fe05170354f03cda018468a65c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 10:48:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30305-master-1' of git://git.luns.net.uk/moodle

commit f98a3833b975d82faa8ffdbe187dd58578f60244
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 10:37:51 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-32659_m23_navcourses' of git://github.com/skodak/moodle

commit 04d7103804545ea14f99ebfb590634b50eaec996
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 10:04:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32340-master-2' of git://git.luns.net.uk/moodle

commit 1c0441bd6a770ef29ee24f984006cc41bf7c8a7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 09:39:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle

commit 8ec7c2cfd98c55d9733ee8929148e199fa7b54ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 09:30:16 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle

commit c96e613c66b00fc7e3bd31e2a5430a9e9145afdf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 09:20:07 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32126-master' of git://github.com/abgreeve/moodle

commit f818719f117a6a0c0c40dc00e4f93700225fc3be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 11:14:28 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-31763-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 9c0f9c588e64005a0b61553aeb69022fcf0d4f1c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 11:14:19 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-31763-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 5ba2e3150fc7e6ee6c4921cdc320d5c7f37f148e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 10:11:24 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31763-master' of git://github.com/abgreeve/moodle

commit 3c611a360e754bdb2c83a87a6cffc859e16a7079
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 10:04:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32780-CLEAN' of git://github.com/netspotau/moodle-mod_assign

commit 137467f5b4edbb7e87d5606325ae898adb790255
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 09:58:12 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32507' of git://github.com/danmarsden/moodle

commit 6bfa88103dfa9b01859b162cc169ab6f04a28acc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 09:52:31 +0800
Tag:    v2.3.0-beta

Merge branch 'master-MDL-31028_2' of git://github.com/chtombleson/moodle

commit 78ed2ec79f101c5df48f5386812f1e9dbd945ddb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 08:15:50 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32857' of git://github.com/danpoltawski/moodle

commit 60301632b9f5dd8aedacb0de8b91b2357f4f3e1f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 08:00:54 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-27562' of git://github.com/rajeshtaneja/moodle

commit 320b4deb6ab195276e047633ad0f64409aa6b25c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 07:56:58 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30649-master' of git://github.com/phalacee/moodle

commit 93af314f7895cf413ea3b63bd5e423b1c6f68c84
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 May 2012 07:45:57 +0800
Tag:    v2.2.3

Merge branch 'MDL-32164-MOODLE_22_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit a1f173f7743c78bf882a339fb996b366a1ee10bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 May 2012 07:31:40 +0800
Tag:    v2.2.3

Merge branch 'MDL-18095-MOODLE_22_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit 4997ac9e2ff571a71fdc640544b01d7d7b262041
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 May 2012 07:31:24 +0800
Tag:    v2.1.6

Merge branch 'MDL-18095-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit f4e4ac8c59c7767ded9e3b26755225a758d0245c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 14:06:52 +0800
Tag:    v2.2.3

Merge branch 'MDL-32670_22' of git://github.com/rlorenzo/moodle into MOODLE_22_STABLE

commit f44480ccccb372cab987c5b5753220a7d86a3875
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 14:06:43 +0800
Tag:    v2.1.6

Merge branch 'MDL-32670_21' of git://github.com/rlorenzo/moodle into MOODLE_21_STABLE

commit 329920fa2260d8a7ba1326ecdbc8725f3d97ebf5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 13:41:52 +0800
Tag:    v2.2.3

Merge branch 'MDL-31671-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 8296031c1f1b2e0b08b05f0f07240da3ad9b979e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 13:41:44 +0800
Tag:    v2.1.6

Merge branch 'MDL-31671-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit ab45e3b491ba5e2a784d14ebf649259726c12fb0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 13:52:13 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31762' of git://github.com/mouneyrac/moodle

commit b702373a4d2bc0d232df81fabbb858cb00ee50c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 13:51:03 +0800
Tag:    v2.1.6

Merge branch 'MDL-31762-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 1470c0f46e116f7b4c6f00858bd5695d2145fd49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 13:44:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26275_large_grader' of git://github.com/andyjdavis/moodle

commit 398e6932b0df5f3f9f729753d4454c6957c9f79b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 10:41:11 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32657-master-1' of git://git.luns.net.uk/moodle

commit fe9693df87681b9f7a9bdb804f2dbe6cf89945ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 07:48:24 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-26028_m23_xsendfile' of git://github.com/skodak/moodle

commit a6d2cf82dcd7abb6880cd19b41dac5e93a74a5f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 06:25:09 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32595_m23_unsignedandlob' of git://github.com/skodak/moodle

commit 7c30505be824d9c8a697ffff25e6f55bf81eeb6c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:43:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32009-master-3' of git://git.luns.net.uk/moodle

commit 75c9c54be4501734edfb459e9eb06fa139112d67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:41:37 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32587_m23_phpunitindividual' of git://github.com/skodak/moodle

commit 3a4b0d0bc00113066031d8b1274fc7c8851faa92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:34:08 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32607_m23_upgrade2' of git://github.com/skodak/moodle

commit d0eeb25a6478c630f744ddcfa68230cbcc471fdd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:33:53 +0800
Tag:    v2.2.3

Merge branch 'w18_MDL-32607_m22_upgrade2' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 46847c220cbc84081b5525195a4249749bf8a41f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:29:39 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32612_m23_debug' of git://github.com/skodak/moodle

commit 4bbefa1c19e7a23fbd9e081e9f9ec0ccbe7cb456
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:26:53 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32640_m23_forumstrict' of git://github.com/skodak/moodle

commit ea7cc40eda09fe50cbb846a154dc34690201d45b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:17:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28955_master' of git://github.com/lazydaisy/moodle

commit 0ee1c3db00e17e89e81f390232ddf6c4883358e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:17:12 +0800
Tag:    v2.2.3

Merge branch 'MDL-28955_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit ba5f2ec6639db3ed834756b03e004858d1cdfa34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:16:54 +0800
Tag:    v2.1.6

Merge branch 'MDL-28955_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 2dcc93644f7637386cd4ec4d0b19e39c72cd7320
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 08:37:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32012' of git://github.com/merrill-oakland/moodle

commit fc3a00dc64447eb71e5f74b382e3a581c50b4d90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 08:37:42 +0800
Tag:    v2.2.3

Merge branch 'MDL-32012_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 7299a9e288909b8fd773da888a5f6388a89af87f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 08:37:21 +0800
Tag:    v2.1.6

Merge branch 'MDL-32012_m21' of git://github.com/merrill-oakland/moodle into MOODLE_21_STABLE

commit 1ad903ea8b034487ee1f19897c568ffd5b668e8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 04:23:52 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29264_zindex' of git://github.com/andyjdavis/moodle

commit 44835cdc8b9676ca1f328d6533d29040d3a6d028
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 04:23:48 +0800
Tag:    v2.2.3

Merge branch 'MDL-29264_zindex_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 817d9328aeee2e2ae0f40a6e13cf9d38f306e1ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 04:23:45 +0800
Tag:    v2.1.6

Merge branch 'MDL-29264_zindex_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 21f7b01d19eac3450c89aba064130c48db7fa6dc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:26:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle

commit ac3f3571a5505aec2afc88a1a1e1fc0dc0cee77e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:21:54 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32597' of git://github.com/danmarsden/moodle

commit 3464845868243a5a9d37af18f3a475c57fe38297
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:21:49 +0800
Tag:    v2.2.3

Merge branch 'm22_MDL-32597' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit d8317f0a40489d9922a257c2e97f0f2f4103c8c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:21:45 +0800
Tag:    v2.1.6

Merge branch 'm21_MDL-32597' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit cc2ae468d234cf98aaa93e360eec53b15e979ac6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:19:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28735-master' of git://github.com/ankitagarwal/moodle

commit 390c3bc54a16f1e427d2813e8ed290273cb9cedd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:15:03 +0800
Tag:    v2.2.3

Merge branch 'MDL-28735-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit dd3dc2e2e3822d300a9c899a06a1b0f114171fed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:14:54 +0800
Tag:    v2.1.6

Merge branch 'MDL-28735-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 6caa86747f4a5c67ecc4d7e1ad9231e8b0c0b830
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:50:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle

commit 446326ab67d847b14fa3d5286280e671dea934c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:46:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26523_grader' of git://github.com/andyjdavis/moodle

commit ead5f3793b1e1ba20ccb85c422b56b32998fc73e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:46:37 +0800
Tag:    v2.2.3

Merge branch 'MDL-26523_grader_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit dd6776c92b8c08d1e59a3e3b129bd3b38713f380
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:46:28 +0800
Tag:    v2.1.6

Merge branch 'MDL-26523_grader_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit b5907a8674c7a56358346084509204944e2ab018
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:33:40 +0800
Tag:    v2.2.3

Merge branch 'MDL-31429_paypal_messages_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 3d173c1d38283695bce1d071be7790aea19a748a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:33:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31429_paypal_messages' of git://github.com/andyjdavis/moodle

commit fd8335c90e35f0f2842c3bb98b9045eaf754edc5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:26:07 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32676_m23_yuibootstrap' of git://github.com/skodak/moodle

commit bc0be2fb800e963528a36fc62406f450e4109719
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:16:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle

commit e074f9763b7cca8b1eacbe1de6ff6f32ae4d13f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:11:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31510_group_activities' of git://github.com/andyjdavis/moodle

commit 8a8f68ff976e8059f14d14713f3f519e91f447f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:11:12 +0800
Tag:    v2.2.3

Merge branch 'MDL-31510_group_activities_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 60aaa96f61b782ba5ccf7cccd85fa31e18e06002
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:11:05 +0800
Tag:    v2.1.6

Merge branch 'MDL-31510_group_activities_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit b5aa51419abf65004973e5083f667ffa171a7518
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:03:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32238-master' of git://github.com/ankitagarwal/moodle

commit b969338742d41c268226d7ef99c7c9f3b06eb131
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:02:50 +0800
Tag:    v2.2.3

Merge branch 'MDL-32238-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 8374754563129da8dddb6b1bbe9eac5875053c50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:02:42 +0800
Tag:    v2.1.6

Merge branch 'MDL-32238-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit c547c7c784b1f630d7519658f196c75b7b88beee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 07:57:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32624_master_wip' of git://github.com/grabs/moodle

commit ba69b6952a9dfc5d9af231506ccb45d097841d77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 07:57:26 +0800
Tag:    v2.2.3

Merge branch 'MDL-32624_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 45bfe330eaccdb3eb39b4d22e6475f0f556dc1d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 07:57:18 +0800
Tag:    v2.1.6

Merge branch 'MDL-32624_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit 6669669fdb125921d6972979506e4c51532d7e2a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:37:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29174-master' of git://github.com/raymanuk/moodle

commit 5335b7deb828d5ce79e2a1bfe9fa020eb17924c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:37:04 +0800
Tag:    v2.2.3

Merge branch 'MDL-29174_MOODLE_22' of git://github.com/raymanuk/moodle into MOODLE_22_STABLE

commit a02e2eafa441ca8d3fdd2eb4174f98a5096d236d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:31:45 +0800
Tag:    v2.3.0-beta

Merge branch 'w16_MDL-32405_m23_estrict4' of git://github.com/skodak/moodle

commit 9f31cf9f33b2469840563dbbfb9d660f268b8476
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:25:27 +0800
Tag:    v2.3.0-beta

Merge branch 'w16_MDL-32447_m23_tcpdf' of git://github.com/skodak/moodle

commit fa3671d49ff4b6d969bc125110d17c96c5440420
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:06:15 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32385_master' of git://github.com/lazydaisy/moodle

commit 80bc3d98800e86aec55917e41f16a3dd1b1c558b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:06:09 +0800
Tag:    v2.2.3

Merge branch 'MDL-32385_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit b83306c0ce65aaf3c19e8557640a4d32a07b794f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:06:03 +0800
Tag:    v2.1.6

Merge branch 'MDL-32385_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 52bb02020d45abf3b11611ba3bc04a862221dcf5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:59:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32444_master' of git://github.com/lazydaisy/moodle

commit 4a979297aa389604b95f28a98ada4038065e4f3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:59:38 +0800
Tag:    v2.2.3

Merge branch 'MDL-32444_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit f2994d7338586b4451197974311316380b4f1262
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:59:24 +0800
Tag:    v2.1.6

Merge branch 'MDL-32444_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit cb4b46f45c197961fc199648f914af47b738cbd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:14:45 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32353' of git://github.com/merrill-oakland/moodle

commit 11990142b0fddba131b7cd1e781c4c3da12c3c67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:11:59 +0800
Tag:    v2.2.3

Merge branch 'MDL-32353_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit f0c351f7632f9cbff4026781d7a0bc59a221ddab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:09:21 +0800
Tag:    v2.1.6

Merge branch 'MDL-32353_m21' of git://github.com/merrill-oakland/moodle into MOODLE_21_STABLE

commit e3d34313ab95b1ea1157906fc636980219a39a9e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:00:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26099-workshop-phase-switch' of git://github.com/mudrd8mz/moodle

commit 448cebee57b0e504bdbb4ffb619d98d863899213
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:23:23 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32388' of git://github.com/danmarsden/moodle

commit 0656d45fbcdbcfa23515480f18ddea8b656604d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:23:10 +0800
Tag:    v2.2.3

Merge branch 'm22_MDL-32388' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 50ff77d26a68250865776d42c71a3be3760d0572
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:23:02 +0800
Tag:    v2.1.6

Merge branch 'm21_MDL-32388' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 96d8c696ce7a192962ac1c59a0421d56b05af9c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:22:50 +0800
Tag:    v1.9.18

Merge branch 'm19_MDL-32388' of git://github.com/danmarsden/moodle into MOODLE_19_STABLE

commit d8b09e5eb2269468f8c0ef31fb970639935f3bf6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:00:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32356_master' of git://github.com/kordan/moodle

commit 885d20828354cfb30729f76ea32a79e34ef14ebb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:58:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32433_master' of git://github.com/kordan/moodle

commit e3a660a2e7a83fc8765aee70e4f207335d6d920e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:52:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32426-master-1' of git://git.luns.net.uk/moodle

commit f295ffebd0472e8a7a0d9e133beca6b3647acb6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:45:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30819_grader_col_highlight' of git://github.com/andyjdavis/moodle

commit 98a4be51768976022a63876ea40b60d09695ee49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:45:36 +0800
Tag:    v2.2.3

Merge branch 'MDL-30819_grader_col_highlight_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 0eeb0874cc29c1f3dace37c5de652ef9f9cb9c97
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:45:29 +0800
Tag:    v2.1.6

Merge branch 'MDL-30819_grader_col_highlight_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit be58371e4e55750ecc94cfae40364da957d39de9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:34:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30955_forum_ratings' of git://github.com/andyjdavis/moodle

commit 77b300ca5184d283f9d9c2b5dacdd5d9b44644f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:34:26 +0800
Tag:    v2.2.3

Merge branch 'MDL-30955_forum_ratings_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 6535721cebaec187dfc968eecfe2bfc528aeb686
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:34:18 +0800
Tag:    v2.1.6

Merge branch 'MDL-30955_forum_ratings_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit b9afb90b7fe7fd29aed95ac4752e30128b668ee1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:00:43 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32316_master_wip' of git://github.com/grabs/moodle

commit cb36e6ba4ab9e130c0d4d73003bd05551839b4ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:00:25 +0800
Tag:    v2.2.3

Merge branch 'MDL-32316_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit a38d62efd8f8a336d8b0b7252f2dfc3c54d912a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:00:16 +0800
Tag:    v2.1.6

Merge branch 'MDL-32316_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit 68c7673088397d9334f6fbec463e4603f6ab6450
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 06:48:15 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27547' of git://github.com/mouneyrac/moodle

commit b182c1238ef4d42e8bad2539089aa7cc35be21c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 06:47:58 +0800
Tag:    v2.2.3

Merge branch 'MDL-27547-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 84aabeae85aee8e6c6cad12601146c6b9b249761
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 06:46:37 +0800
Tag:    v2.1.6

Merge branch 'MDL-27547-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 9f8662a52825da27b3a3a3f5e20ca23381f282c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 13:21:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32124_master_wip' of git://github.com/grabs/moodle

commit ec01a02d8b8092c3ae782f2b53ad4edd6dd02af8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 13:11:57 +0800
Tag:    v2.2.3

Merge branch 'MDL-32124_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 365e69b47dfb11c81d9ec6a1aa8118382df70529
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 13:11:49 +0800
Tag:    v2.1.6

Merge branch 'MDL-32124_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit 0ccb4dcce099781938a3e8ca8efda4168e3eed80
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 08:38:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32349-master' of git://github.com/sammarshallou/moodle

commit 5bfeb5ffd39f2b0c73c9b6cb679949a71936ef7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 08:34:37 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle

commit b054ead121779a944a3d59668a2949c7cb182f2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 07:01:37 +0800
Tag:    v2.2.3

Merge branch 'MDL-30843_b_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit ea7170945cdafbc732c3beefb45f613ab7b8c7c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 07:01:27 +0800
Tag:    v2.1.6

Merge branch 'MDL-30843_b_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 859a181627ba3afb8da2a3f1c2bdac4d83b360d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:53:34 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-32270' of git://github.com/rajeshtaneja/moodle

commit 3f046db1501da3b9b047cb3b3e8fb5c59aff8096
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:53:19 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-32270-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 56e270e11ed5ae2dfb01ea6814beca982f2e9b1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:53:12 +0800
Tag:    v2.1.6

Merge branch 'wip-mdl-32270-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit aef4aafa0b3f46b587a1e19afd9e7c92b9dfc08c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:48:34 +0800
Tag:    v2.3.0-beta

Merge branch 'w15_MDL-32263_m23_enroladmin' of git://github.com/skodak/moodle

commit d9cc6b7a31cb95bd8f68b8fe3e5007541827e21b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:48:15 +0800
Tag:    v2.2.3

Merge branch 'w15_MDL-32263_m22_enroladmin' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 93068559b7565f45c411063c642f8ad0a7191dba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:43:08 +0800
Tag:    v2.3.0-beta

Merge branch 'w15_MDL-32293_m23_timeout' of git://github.com/skodak/moodle

commit 756d5f761050c182d523a1e9fbec39c2449653b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:37:45 +0800
Tag:    v2.3.0-beta

Merge branch 'w15_MDL-32308_m23_sharing' of git://github.com/skodak/moodle

commit f1b06f6d54b45ddedb39567b4015cc493dcfb9d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Apr 2012 10:19:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32009-master-1' of git://git.luns.net.uk/moodle

commit cad96a8a365d7d8a86041160d76d32c30fe37f0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Apr 2012 04:22:16 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32137-master-1' of git://git.luns.net.uk/moodle

commit 729ef697055379ea51e2e59b5b6bb74817579f85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Apr 2012 04:21:52 +0800
Tag:    v2.2.3

Merge branch 'MDL-32137-MOODLE_22_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit 7b98a1dfd89f0332d6fe5eaf53b6fe670db1d45c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Apr 2012 06:33:06 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-32150' of git://github.com/rajeshtaneja/moodle

commit f65eadd42db932e9eb63dbd2dda8737f954df9b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Apr 2012 06:32:53 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-32150-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 3e14545d2d05c11d678f435d5859697b4a93f7e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Apr 2012 06:32:33 +0800
Tag:    v2.1.6

Merge branch 'wip-mdl-32150-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 530eecc0f900a4b0f53b1891369e75c482703542
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 10:31:30 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32239' of git://github.com/timhunt/moodle

commit 2de2d0d2cd9e6dffdfa50062b77428d3a361fadb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 10:31:08 +0800
Tag:    v2.2.3

Merge branch 'MDL-32239_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 6931d5408532aec94af33e261cd0724ebedc0b7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 10:31:01 +0800
Tag:    v2.1.6

Merge branch 'MDL-32239_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit ea6805f009e33526d1121f5d07bfcaf9c41a5f7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 08:26:41 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30981' of git://github.com/stronk7/moodle

commit 880a40c5b1262aa8fa200a8b53e8766ed55bbdef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:28:09 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32256-cron-return' of git://github.com/mudrd8mz/moodle

commit 0292c465fe726f36c647b7888e1c99241bf0489f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:27:55 +0800
Tag:    v2.2.3

Merge branch 'MDL-32256-cron-return_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 4958b6f224487df7705166471fe93fac3b95dfc4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:24:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32258-data-cron' of git://github.com/mudrd8mz/moodle

commit 12376c971f543a69f80acd1f74ba9b59e5e0eb90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:24:41 +0800
Tag:    v2.2.3

Merge branch 'MDL-32258-data-cron_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 50cc39f9503b8d08177709a6bc55f5ff3abb8f14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:24:16 +0800
Tag:    v2.1.6

Merge branch 'MDL-32258-data-cron_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 90ad4ed5897ccbef109550a0de26a049aadb1dfe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:19:58 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31908_glossary_entrylist_print_version_not_showing_content' of git://github.com/kanikagoyal/moodle

commit 3279dd42535bfb6d36eb601fc2bef9a91f5931c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 06:22:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31711' of git://github.com/nebgor/moodle

commit 6b8e99dd87d8ab6c37cebb458ad12606e17dd225
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 06:16:52 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32289' of git://github.com/lazydaisy/moodle

commit fc0acdfacda1a5e5e7444101aa7898c1c752b9a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 06:16:20 +0800
Tag:    v2.2.3

Merge branch 'MDL-32289_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit c185ac18f59170f7cf08217f45fa64d1de0dbcbe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 06:15:41 +0800
Tag:    v2.1.6

Merge branch 'MDL-32289_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit a7cd1f5a53ee7b3fe5a3f2b203e6a980632531c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 06:03:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-22510-master' of git://github.com/ankitagarwal/moodle

commit ec202ddbbab08e8f219de04671215499af16864d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 06:03:08 +0800
Tag:    v2.2.3

Merge branch 'MDL-22510-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit c4d72072dc0e074e63c67aa1bf23d9a2ab4245fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 06:02:53 +0800
Tag:    v2.1.6

Merge branch 'MDL-22510-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 5dc1a544ea620692600904bf5a378e6bdfd9c2ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 05:05:43 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-11378-master-2' of git://git.luns.net.uk/moodle

commit c1949252789fe1618e0e40fdd138ef6b1681d29b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 04:51:40 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32147' of git://github.com/danmarsden/moodle

commit 015c334a7303be4d0c9cf465efc6c0524a26a71b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 04:51:28 +0800
Tag:    v2.2.3

Merge branch 'm22_MDL-32147' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 88ead1b9ff452ae08583a52ddc6f8d30483da7f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 04:50:19 +0800
Tag:    v2.1.6

Merge branch 'm21_MDL-32147' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 9491f60e442d4ec0470e9356cec030313065795c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 07:01:29 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32142-master-1' of git://git.luns.net.uk/moodle

commit 3e17de5eaddaf2c2184442c25caee8d0ecdb9402
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:57:39 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-29331' of git://github.com/rajeshtaneja/moodle

commit 2733a8c4d592f56058a155fd473bb8807c28c25a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:57:29 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-29331-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 8a4aa94daf2232fe13e3c086b56172e8e4affac7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:57:20 +0800
Tag:    v2.1.6

Merge branch 'wip-mdl-29331-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit abdbeec6bb873b6deb8e434a04f6d228ac819475
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:19:27 +0800
Tag:    v2.2.3

Merge branch 'MDL-29400' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 991b3a3a9bd93c36dbdf131b436e506535b6d4cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:13:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32026-master-2' of git://git.luns.net.uk/moodle

commit ef288bd4d382737f2629541082dc677518cfe9b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:06:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32027-master-1' of git://git.luns.net.uk/moodle

commit 75e5bd51ea572dbfa054443cc88b425325f28902
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 05:35:48 +0800
Tag:    v2.3.0-beta

Merge branch 'w13_MDL-31685_m23_filelocking' of git://github.com/skodak/moodle

commit 0a5bc5dd470e851d4e6ca210f6cf003e55c9fadb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 05:31:36 +0800
Tag:    v2.3.0-beta

Merge branch 'w13_MDL-32029_m23_extdb' of git://github.com/skodak/moodle

commit 117bd705f3f694a920e5afd265e8a84412da8d3e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 23 Mar 2012 07:11:57 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 292f509cfff0ef8d7c0a8d9734f7c71db14bfb1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 23 Mar 2012 07:11:03 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 0982968a37e89fb91d060236509507dd0eceef36
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 23 Mar 2012 07:10:44 +0800
Tag:    v2.1.6

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 657db60a9929769102846d4686c982ba58d120b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 23 Mar 2012 07:10:14 +0800
Tag:    v2.0.9

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 3222f6eca1e7a55c3fd4fa68d738f5a1224ba4dc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Mar 2012 05:44:04 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-31857_m23_phpunit' of git://github.com/skodak/moodle

commit a7dedc5efee57f33bdee8194f42f8ab8009d0039
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:50:20 +0800
Tag:    v2.1.6

Merge branch 'wip-mdl-31640-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 89399cb129f8e5aa677352b911a69a7c521c9d64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:50:13 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-31640-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 1a381535e6caf2755afd9462ccb5d250fa06384a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:41:32 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-31640-new' of git://github.com/rajeshtaneja/moodle

commit 333b9ac765c6b896f268dd081fba5525bd01375f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:29:24 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28952-master' of git://github.com/ankitagarwal/moodle

commit 0d2001b756190b31ab4d73affc234e0fce633865
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:29:12 +0800
Tag:    v2.2.3

Merge branch 'MDL-28952-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 7ad20028b0cb3417320e0560507a3fe33156d38f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:29:03 +0800
Tag:    v2.1.6

Merge branch 'MDL-28952-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit bc4340ca9cd2723ba212064c396af6cdf3c3ae21
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:24:58 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32065-master-1' of git://git.luns.net.uk/moodle

commit e5f9484e46c6edce4d4ad4edf9caba1802e40747
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:24:38 +0800
Tag:    v2.1.6

Merge branch 'MDL-32065-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 23dfb50687496c196b4f3ad6d8b950e7731578ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:20:29 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32094_integration_fix' of git://github.com/skodak/moodle

commit ef844d0a156c629bb9a30d9678522b014e8c24c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 11:47:17 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle

commit 270bdf5265b968f3a45b97fa4c27e72a1ece2308
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 09:04:04 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-11047' of git://github.com/mackensen/moodle

commit dff9c69fa8a5023795ee4c3eeb8c591de847e5db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 08:41:20 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-32036-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit 404958a0c442a7da7a0d6e45825014fa33083abe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 08:41:11 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-32036-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_21_STABLE

commit 62cf6937f6521fa34c1ddf31439e4ff520d7053b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 08:33:30 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32037-master' of git://github.com/marinaglancy/moodle

commit 26777ab2c382207a9edb869010708add6a0bf029
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 08:33:17 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-32037-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit fa93616a237424215454e698e01d69b13be1e940
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 08:33:08 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-32037-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_21_STABLE

commit 9340d834f39b9819855274b1cf1fb9102545116b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 07:50:21 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32050_m23_minify' of git://github.com/skodak/moodle

commit e2edc82058abb24db8ebb65595ceb71acb9dafbc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 07:12:44 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32043_m23_webserver' of git://github.com/skodak/moodle

commit f40400b91e5e109e4e30fab57d157e483611909d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 07:06:07 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32045_m23_resetnorole' of git://github.com/skodak/moodle

commit ef3b34ccc73401834181e912a08e7a167bdf7b97
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 07:02:05 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32052_m23_authtype' of git://github.com/skodak/moodle

commit fab344f54b6de99d08a875bb194031243ee8ce6f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:46:00 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32071_m23_dbfamily' of git://github.com/skodak/moodle

commit e9d7fb3a8881318ccbfe594b1903464ba9d8bf51
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:40:01 +0800
Tag:    v2.2.3

Merge branch 'w12_MDL-32071_m22_dbfamily' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit a11492d7e8918e47e45911020857a82b3c9d7a06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:39:43 +0800
Tag:    v2.1.6

Merge branch 'w12_MDL-32071_m21_dbfamily' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 3a14100d8d6c8add091ab51f263e54a93534aef8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:39:33 +0800
Tag:    v2.0.9

Merge branch 'w12_MDL-32071_m20_dbfamily' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit b896c12bcad2fc135561fa245c9dce8e6f41eefe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:34:21 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32079_m23_folderrev' of git://github.com/skodak/moodle

commit e6c9fdb384005d729b4be278d1f97eebb6d76140
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:34:09 +0800
Tag:    v2.2.3

Merge branch 'w12_MDL-32079_m22_folderrev' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit d29f6ebcd34ac90b5febb76654dd4c9b91030e0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 06:34:01 +0800
Tag:    v2.1.6

Merge branch 'w12_MDL-32079_m21_folderrev' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit f7dbc2814c61fba173559ebc9caf71e0e47323af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 05:37:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32064' of git://github.com/timhunt/moodle

commit 33ce9928d89c9e329e083c45d37d48aece28cc96
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 05:37:27 +0800
Tag:    v2.2.3

Merge branch 'MDL-32064_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 2aab431486f949c098ecbf1f0fd48cde8e04ea61
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 05:37:20 +0800
Tag:    v2.1.6

Merge branch 'MDL-32064_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 2525cee57360763eaef2ac9700d62ac488a471e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:38:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32084_master' of git://github.com/lazydaisy/moodle

commit 2cd9cfcc974aa364f217c80da79e3962f740d74c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:38:14 +0800
Tag:    v2.2.3

Merge branch 'MDL-32084_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 2849965662b76e66164dee1905c4299df8f372db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:38:05 +0800
Tag:    v2.1.6

Merge branch 'MDL-32084_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit b31865ce2a4eba61a4e0bae306650a3e55c8250b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:33:48 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32090_m23_groupui' of git://github.com/skodak/moodle

commit a440a25c64754b809e929e0db847dff651df20c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:33:38 +0800
Tag:    v2.2.3

Merge branch 'w12_MDL-32090_m22_groupui' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 9231ed5d793a596e42f697abfcdd5b94640aa907
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:33:31 +0800
Tag:    v2.1.6

Merge branch 'w12_MDL-32090_m21_groupui' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit f436d12c6020929a2d00ed7b73eb152b80b547ee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:33:23 +0800
Tag:    v2.0.9

Merge branch 'w12_MDL-32090_m20_groupui' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit ae89dd8de901ab8304f0f299af69f6d7d4f4e96f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:29:39 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32046_m23_lastdbuser' of git://github.com/skodak/moodle

commit 2cd97ff3c58f0764cad06db1988c330bbec7781b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:16:34 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-31703_m23_rootdirroot' of git://github.com/skodak/moodle

commit 47def74bb8145b7712f1fc38fcfc64518c95ff71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:06:40 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-26674' of git://github.com/rajeshtaneja/moodle

commit 56f55380a9c97fc2dd772db07ec5168219d510c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:06:28 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-26674-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 265724046dab6f9e0b8707bff3c9b272cf8ad0d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 15:06:20 +0800
Tag:    v2.1.6

Merge branch 'wip-mdl-26674-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit ed8561171506f5802ad8e50f6ffb61aeb7d18619
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 14:10:59 +0800
Tag:    v2.1.6

Merge branch 'MDL-31984_theme_renderer_file_debugging' of git://github.com/ualberta-eclass/moodle into MOODLE_21_STABLE

commit 70a63a726db937d61c45cd8c08e6a6ee115e6213
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 10:53:56 +0800
Tag:    v2.1.6

Merge branch 'm21_MDL-32055' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit f359fd6fcc99a9eeecea994e94a999bc7ebb7ef4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 10:49:05 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-27064-master' of git://github.com/phalacee/moodle

commit 8b66d25681e7b6688c39d3aa9cfbc586858a08ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 10:48:52 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-27064-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 9ac6d34dbd2d451338c29cfd18f3a46cbb9f9fb8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 10:48:37 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-27064-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit 1a8ea682ef9fb0f758fefa08c3936ff2a85389a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:37:49 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32004-master-2' of git://git.luns.net.uk/moodle

commit 55652c87a8ee05e33c655ca941fdcbbfdc637394
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:28:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32008-master-2' of git://git.luns.net.uk/moodle

commit 6972a9b7b7da8dbb32f3061d953300b51a6929a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:14:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28187_messaging_nav' of git://github.com/andyjdavis/moodle

commit fc109fac2dc9ec604bffb2de8ea7ff841995af64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:14:17 +0800
Tag:    v2.2.3

Merge branch 'MDL-28187_messaging_nav_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit b7fa2f915399cecb7763637d9e9386c76e1e76a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:14:08 +0800
Tag:    v2.1.6

Merge branch 'MDL-28187_messaging_nav_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 223d02a468b9dce15e28cd81b948ac5ed017beca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:10:37 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31835_recent_conversations' of git://github.com/andyjdavis/moodle

commit 3905c1f75b3fa07426049d13ad4345b0723e8475
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:07:05 +0800
Tag:    v2.2.3

Merge branch 'MDL-31835_recent_conversations_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 5a7722e046a2fdb4196bce4fa68d44878b83d03f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 09:06:43 +0800
Tag:    v2.1.6

Merge branch 'MDL-31835_recent_conversations_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit fb1d0388fffecfeaa4ae7e44f45c1fd188142846
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 05:28:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30890' of git://github.com/rwijaya/moodle

commit fb2e8f82c9ad37ae3fd8f8d854fc7708b00c0391
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 05:27:22 +0800
Tag:    v2.2.3

Merge branch 'MDL-30890_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit d0690afbc32c86dd7cd2de8d11f278ae473ed583
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 05:27:01 +0800
Tag:    v2.1.6

Merge branch 'MDL-30890_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 264743baaf0175b6740d6af7ee084dce22bd51a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Mar 2012 05:07:57 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-19125_module_security' of git://github.com/timhunt/moodle

commit 00efe9375903e5ec8b8ae573155eaddfcaa5c122
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 09:40:07 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-28972' of git://github.com/rajeshtaneja/moodle

commit b87ca9b7132293a1b78454f7362905fc8368ed54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 09:39:59 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-28972-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 3d9dff0f229c269d7bf3d6f127bef8d311ef46c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 09:39:51 +0800
Tag:    v2.1.6

Merge branch 'wip-mdl-28972-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 652d49ab350da6e5596e0f35668e7300e49d8a7b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 06:52:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29147_insertElementBefore_warning' of git://github.com/davosmith/moodle

commit 40ba373443cd315128343f09ea5c993ab9d528c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 06:30:21 +0800
Tag:    v2.1.6

Merge branch 'MDL-29440-21_STABLE' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit 999e6901c86899d8535b14b733204e1591aca335
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 06:30:06 +0800
Tag:    v2.2.3

Merge branch 'MDL-29440' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit dfcf582c4365c955c705645a3dfa7e24c489c9e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 06:29:52 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29440-master' of git://github.com/danpoltawski/moodle

commit 29a225040c69f6b1c786d5f79c7b6558d82aed57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 06:23:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31975_master' of git://github.com/kordan/moodle

commit 1c1cb8cd9a3cb86a1747d925a9a89adddb3501ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Mar 2012 06:15:13 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31169_master' of git://github.com/lazydaisy/moodle

commit a28c6b40fe226467a5abc0ab65c71bdea105d051
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 11:35:15 +0800
Tag:    v2.3.0-beta

Merge branch 'scorm_graph_report' of git://github.com/ankitagarwal/moodle

commit db6d54c337915f579e41b26086886d9a30410ce7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 09:10:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31808-master-1' of git://git.luns.net.uk/moodle

commit fd9dbadb15258954a073c460cbcefe080e9dcd61
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 09:04:44 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31917-master-1' of git://git.luns.net.uk/moodle

commit 595dc849dd5b28cbd4eadd9b43abe76bcb0a6b3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 09:00:41 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31919-master-2' of git://git.luns.net.uk/moodle

commit 820a80f903b6f72aaec520268e633626e7e38a22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 07:00:08 +0800
Tag:    v2.3.0-beta

Merge branch 'w11_MDL-27457_m23_enrolnorecover' of git://github.com/skodak/moodle

commit 22dde645f4de78e0d59c43d1c3cfa2fed2d414a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 06:59:53 +0800
Tag:    v2.2.3

Merge branch 'w11_MDL-27457_m22_enrolnorecover' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 63f4993e4a8b76ea706415ba94191dcaf2431767
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 06:59:44 +0800
Tag:    v2.1.6

Merge branch 'w11_MDL-27457_m21_enrolnorecover' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 449fd68024a5fcc312e3d027f36ae0c3d67621c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 06:56:27 +0800
Tag:    v2.1.6

Merge branch 'MDL-30298_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit d254ae8cfe229bf2c999f047259d06e77f84f530
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 06:56:18 +0800
Tag:    v2.2.3

Merge branch 'MDL-30298_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 397ee1972755884a7efab706923528d8c64f3f49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 06:55:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30298_master' of git://github.com/lazydaisy/moodle

commit 80fa598515763f5d0e466f483c4e326e2a667bff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 05:34:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31702' of git://github.com/timhunt/moodle

commit ec2b87aede6bd0acce391a4571d30c9c0ece9a45
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 05:33:39 +0800
Tag:    v2.2.3

Merge branch 'MDL-31702_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 421a8533c558db1037148fdd25181b8cc05bb668
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 05:33:16 +0800
Tag:    v2.1.6

Merge branch 'MDL-31702_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 3108b6412c2483063773aa88b8f859a78fab3ca7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Mar 2012 05:10:36 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31362_unused_constant' of git://github.com/andyjdavis/moodle

commit 06a31cb7b859daa131682565e962f0e44d185bc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:34:23 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-27087-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit fe0979ea3d37b478649a622bfccc91c1f9ab5cf2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:29:39 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31888' of git://github.com/danmarsden/moodle

commit b3fe3fb6c8b0b7f51d566775ead551c10a0733e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:29:11 +0800
Tag:    v2.2.3

Merge branch 'm22_MDL-31888' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 2774a46792d6bb33bcaa657eacebe02057f26020
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:20:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27304-master' of https://github.com/mackensen/moodle

commit 25ff180756b1cdbbe96f69af0906c8afa9180072
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:05:21 +0800
Tag:    v2.2.3

Merge branch 'MDL-27304-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit 81dc3b5fd5e25828370e23320bbe927eae02d2a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:05:12 +0800
Tag:    v2.1.6

Merge branch 'MDL-27304-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

commit cbb8087b306ae967a2604f212e2ba7ea84905966
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 12:02:07 +0800
Tag:    v2.2.3

Merge branch 'MDL-31664-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit f0fe35bbbd42603e1a93fa0a561c91c5a02131a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 11:28:16 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27212-master' of git://github.com/ankitagarwal/moodle

commit 840dc3cb947313953bee9092ef4116e4441d8b04
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 10:26:21 +0800
Tag:    v2.2.3

Merge branch 'MDL-28997-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 401f9295150fea85fc4434cc5dca72d41299e613
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 10:19:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28998-master' of git://github.com/ankitagarwal/moodle

commit 5c3f51714218126fc03702b722f1cea5d42f1cb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 10:18:13 +0800
Tag:    v2.1.6

Merge branch 'MDL-28998-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit d9fc82157b20d79d122ce4400a28a0bd88abb30d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 10:15:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31811-master-2' of git://git.luns.net.uk/moodle

commit 6bf6e113bb3e591aa62b4c3526d0a08320bcdbe5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:57:11 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31877-master-1' of git://git.luns.net.uk/moodle

commit 100875efdbfcdb5f659d69233430c0018a645a92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:54:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31918-master-2' of git://git.luns.net.uk/moodle

commit 8dd4ccfbb33c5b893f44267a88cef20360fb7dd9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:33:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31923-master-6' of git://git.luns.net.uk/moodle

commit 256e3edf0ef84d6624a4605cec342c809200a5ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:32:45 +0800
Tag:    v2.1.6

Merge branch 'MDL-31923-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 44f24f13515802191f2254138bd7be27d68edf50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:22:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31841_feedback_align' of git://github.com/andyjdavis/moodle

commit 7ac10ac609a1978d10b5481d5ec8aaafe4fce2ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:22:10 +0800
Tag:    v2.2.3

Merge branch 'MDL-31841_feedback_align_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit df3a3b45da0afe57bdfcf0944b3c91abc1beaad5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:22:02 +0800
Tag:    v2.1.6

Merge branch 'MDL-31841_feedback_align_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 2b824233ad14707be84daefbedd28340fed9f6fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:20:02 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30906-master' of git://github.com/abgreeve/moodle

commit 113b864ffc71da7b594a958be40d9dc345e25ba2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:19:50 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-30906-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 06dd9ad0d85f890e0fee2bce1bde8ff24c217380
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Mar 2012 09:19:42 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-30906-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit c607258ae4b1facf78c4d5d25d5f54e71a3553f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Mar 2012 06:46:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28387-master' of git://github.com/ankitagarwal/moodle

commit deaf559402cd4eff1dd928487cb6e5ff018022c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Mar 2012 06:46:32 +0800
Tag:    v2.2.2

Merge branch 'MDL-28387-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit ce0e7afd404a74889cca687eec73197747472850
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Mar 2012 06:46:21 +0800
Tag:    v2.1.5

Merge branch 'MDL-28387-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit cb0a0690191e61a7a1c9be548d22ef2fe6824a5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Mar 2012 05:19:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27764' of git://github.com/stronk7/moodle

commit bd8718922292889739da98ecffc4f6a398cecdcf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Mar 2012 05:19:00 +0800
Tag:    v2.2.2

Merge branch 'MDL-27764_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit b2896fd59f579d54bd380895910442b7a47b9655
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Mar 2012 05:18:51 +0800
Tag:    v2.1.5

Merge branch 'MDL-27764_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 22e5ef529d368b2e64f869a5356aeb3ae453032f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Mar 2012 04:57:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31328_master' of git://github.com/lazydaisy/moodle

commit 1392fd114a079ba8fa28f873f248196c7f83479b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 12:03:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31828' of git://github.com/timhunt/moodle

commit 575a5530944f28dd67350265995470146503557e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 12:03:20 +0800
Tag:    v2.2.2

Merge branch 'MDL-31828_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 3bfeac2dfae71ba04e71db47c9021cc8736f5965
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 12:03:11 +0800
Tag:    v2.1.5

Merge branch 'MDL-31828_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 0d4f9805efb07d534b82039318ff9b0a533626a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:56:30 +0800
Tag:    v2.3.0-beta

Merge branch 'w10_MDL-31807_m23_cohort' of git://github.com/skodak/moodle

commit 7d6c1a19bbdbe90deec1b033bdfc230d0568f33e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:56:05 +0800
Tag:    v2.2.2

Merge branch 'w10_MDL-31807_m22_cohort' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit b3e2eb804a27b9d8ab14430b4dcad5aad7fb5540
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:55:57 +0800
Tag:    v2.1.5

Merge branch 'w10_MDL-31807_m21_cohort' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit da27633d029f2ab922f49de08ed9199711566bbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:55:34 +0800
Tag:    v2.0.8

Merge branch 'w10_MDL-31807_m20_cohort' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 0d077cef065165b26035ce58fec642227c7b1725
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:45:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31821_master' of git://github.com/lazydaisy/moodle

commit 94cfcb36a58566f96e12651f4e152686373637b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:13:08 +0800
Tag:    v2.2.2

Merge branch 'MDL-29347-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 41b542d96dff3aba2562ead0d2843e8714762aaf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:12:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29347' of git://github.com/mouneyrac/moodle

commit d5f1dab8f29a805841e7778c0510aea2f475958b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:08:40 +0800
Tag:    v2.1.5

Merge branch '21_MDL-30724_count_real_submissions_eloy_suggests' of git://github.com/gerrywastaken/moodle into MOODLE_21_STABLE

commit 0c0ae1c6969121702b68b241b7ab5f3ee6f7da76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:08:30 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30724_count_real_submissions_eloy_suggests' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 29747783e280aee108c94c6e309f255e7b4b78d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 11:08:19 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-30724_count_real_submissions_eloy_suggests' of git://github.com/gerrywastaken/moodle

commit 8576f705f7dc78cf2687c6a70ef67d40d0b8e077
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 10:21:29 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31707' of git://github.com/stronk7/moodle

commit f8c24829ab62249d2e9dcaeac08c9f45d22e6cbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 10:21:19 +0800
Tag:    v2.2.2

Merge branch 'MDL-31707_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 3fe51df42ec8013320d10ac555e952512f6a9230
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 10:21:12 +0800
Tag:    v2.1.5

Merge branch 'MDL-31707_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 9394d863672448e873e117ee109ba3bb07b76b5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 09:03:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26037' of git://github.com/stronk7/moodle

commit 4e738cab73ec2892bc031f2fddaa54031543655c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 09:03:26 +0800
Tag:    v2.2.2

Merge branch 'MDL-26037_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 36bad5bfcdc6c716715c74effcb8324601e5b1d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 09:03:20 +0800
Tag:    v2.1.5

Merge branch 'MDL-26037_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 37b6e7a03c77ea99fbe5224a15419e318019c570
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 08:54:46 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29248' of git://github.com/stronk7/moodle

commit 62a2c4fd22cbe3678bfb4b121b5ae0fa3a77287c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 08:54:27 +0800
Tag:    v2.2.2

Merge branch 'MDL-29248_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 33bd4e0455eb5a9bde398e8d78c9c9081121d7d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 08:54:03 +0800
Tag:    v2.1.5

Merge branch 'MDL-29248_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 131e9f7fb95241ade10711db89769e9c7ef58f50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 08:53:23 +0800
Tag:    v2.0.8

Merge branch 'MDL-29248_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit b04d5217bf80d7adb0d0f41344e7f240e2c2092e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 08:36:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31710' of git://github.com/stronk7/moodle

commit 36d1d23179cb43f58f0fa16d1bde46ce7fbf6a41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 08:31:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31642_dndupload_filemanager_notification_text' of git://github.com/davosmith/moodle

commit 9b0e5e9d0d33c84696ccfc634c435af1633318ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 08:22:04 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31643_dndupload_reject_all_files' of git://github.com/davosmith/moodle

commit 272853aec996a8aad33e83c35a3c9eab492e7e37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:30:36 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31749' of git://github.com/danmarsden/moodle

commit bf4649edb544166ea8a9822cd95ff9299d7ae110
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:30:05 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31749' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 26f76c9c6cccee12a8316e75b05f8afd19154ced
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:22:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-24235-master' of https://github.com/mackensen/moodle

commit e6f2103ce7a72e74b881802f0124b9e1c581cf21
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:22:19 +0800
Tag:    v2.2.2

Merge branch 'MDL-24235-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit fc697419add5ed378f12fcc66583c5d9c7240211
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:20:48 +0800
Tag:    v2.1.5

Merge branch 'MDL-24235-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

commit a45621394b0ea2026d6dec3ff22014e584b533cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:05:53 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31806-master' of https://github.com/mackensen/moodle

commit fecb44d7b5132df618807aef63686a236afb3dc7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:05:39 +0800
Tag:    v2.2.2

Merge branch 'MDL-31806-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit ff79a72c10899ecc25bcf9a531a99c2292d25dd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 07:05:30 +0800
Tag:    v2.1.5

Merge branch 'MDL-31806-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

commit 0170ada63be8c4b984db93f54f8d4eb005df8837
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:52:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30893-master' of git://github.com/ankitagarwal/moodle

commit c71b744a43ac40eca6fc3385e82b24bec8153de6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:52:45 +0800
Tag:    v2.2.2

Merge branch 'MDL-30893-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 974c44643445e80d450d4994c6d963d15a0d8de1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:52:36 +0800
Tag:    v2.1.5

Merge branch 'MDL-30893-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 936deb7e680541fb8d259d5b9348aa6712c6ab9b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:35:18 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31466-master' of git://github.com/ankitagarwal/moodle

commit 5c3c0a8ce5c61b1582a70713f6435627782186d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:30:53 +0800
Tag:    v2.2.2

Merge branch 'MDL-31466-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 63ecec3c372f85203f306f501a2e736b79afc337
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:28:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31655-master-3' of git://git.luns.net.uk/moodle

commit 8498e630af25bc30929b6b9d8d4099edb2648f24
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 06:09:29 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31656-master-3' of git://git.luns.net.uk/moodle

commit f788011045823539f6938c535769e2a6b2fc4b34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 05:59:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31660-master-3' of git://git.luns.net.uk/moodle

commit 06422b0a22605225f52031899d6309eadfbaddc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Mar 2012 05:46:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31353_grader_io' of git://github.com/andyjdavis/moodle

commit 1fa9907b7d3c97a9633132738211ef0a0430a6b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Mar 2012 09:36:07 +0800
Tag:    v2.1.5

Merge branch 'MDL-31831_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit ebbb9143469e78ef2110e3fc93712fb89e7c913a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Mar 2012 09:34:52 +0800
Tag:    v2.2.2

Merge branch 'MDL-31831_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 887fd0e4c7425e99eeebf39b4970891b0ee340ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Mar 2012 09:34:09 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31831' of git://github.com/stronk7/moodle

commit a513048a0020e8fb30c270adddecd663a3d00073
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Feb 2012 05:58:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30987_message_docs2' of git://github.com/andyjdavis/moodle

commit 2caf3f9beee4300010e0ce36033a8a2fc7a8f759
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Feb 2012 05:22:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30910' of git://github.com/rwijaya/moodle

commit 68eeca86213a91d8ca169cdb85c80a16907949f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Feb 2012 05:21:53 +0800
Tag:    v2.2.2

Merge branch 'MDL-30910_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 65773fe2fe64b4ab30860eec319bcb5e2f60978e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Feb 2012 05:21:28 +0800
Tag:    v2.1.5

Merge branch 'MDL-30910_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 31593361a8eaf2257ed1f6e27d5f708777f9c70d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 09:56:13 +0800
Tag:    v2.2.2

Merge branch 'MDL-30249-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 44e59a587cf962397026347a94714c50417d8c9f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 09:55:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30249' of git://github.com/mouneyrac/moodle

commit 4ddd465a2a696787ff1d6f00b6172d6c30f2f198
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 09:44:50 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31158_grade_recovery' of git://github.com/andyjdavis/moodle

commit ceaad8822233a53d5a413d458e3f173f9a128c5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 07:07:30 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-30974' of git://github.com/rajeshtaneja/moodle

commit 26aca872cab073c6bc5af02a7bcdcd9d25089422
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 06:59:48 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-30988_adding_preference_api_phpdocs' of git://github.com/gerrywastaken/moodle

commit e6e4fe4f430ed8fb829c68b1c47fbe9cbf1791e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 05:44:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29402-master' of https://github.com/mackensen/moodle

commit f2315259923bd97c855732aa050e307bf10b58a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 05:43:41 +0800
Tag:    v2.2.2

Merge branch 'MDL-29402-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit d7375d7ecba6b2ee5659fe3b6d685b9f0ea4fb49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 05:43:29 +0800
Tag:    v2.1.5

Merge branch 'MDL-29402-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

commit da3ec93275f07f6d3d5ed3b457dc72596ac01c87
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 21 Feb 2012 05:33:00 +0800
Tag:    v2.3.0-beta

Merged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict resolution

commit e76eba8111c59cf7180236c8eca6fc5f019daa13
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 13:20:37 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-29967' of git://github.com/rajeshtaneja/moodle

commit ab04c70d56d8f4024a89a0c80d7a8fbec4223696
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 13:20:22 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-29967-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 7d03210e74459568966447bee401e329e0239723
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 13:20:14 +0800
Tag:    v2.1.5

Merge branch 'wip-mdl-29967-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit fcd6bdd4fa5feb55fdfeca71884068a245f98484
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 13:07:13 +0800
Tag:    v2.3.0-beta

Merged MDL-29254 with conflict resolution

commit ace2654b5d734281bfe0e369573d0af54c077112
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 13:06:06 +0800
Tag:    v2.2.2

Merged MDL-29254 with conflict resolution

commit 7e87a3af321c4b71dde7cd6f4daffcb52c7c6e9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:59:08 +0800
Tag:    v2.1.5

Merged MDL-29254 with conflict resolution

commit c2627cf429cbcde6abdd1c24fedeb4b7eb65709f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:34:58 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31483_master' of git://github.com/lazydaisy/moodle

commit 5128ef6b452964b54ebbd9529abcc760e16b1f8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:29:47 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30780-master' of git://github.com/marinaglancy/moodle

commit c8072f8b508729f6ece7f56d683846d8ed5edcc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:29:33 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-30780-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit 8e1b1b270bf33c721a81c96dbb4e0388ae191c98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:25:48 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31627-master' of git://github.com/marinaglancy/moodle

commit e86284fefd97dbbb47e7bd939b4ddb8b605d39ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:25:36 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31627-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit f37f43f3dd959c182ed70b51889b88e7210b3910
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:25:26 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-31627-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_21_STABLE

commit b91c364ef3766335c1a374813f193b9071b89157
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:13:36 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-31388_fix_enrol_LDAP_typo' of git://github.com/gerrywastaken/moodle

commit c63a91d44aaa65c558239509e05e663928b39e1f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:13:25 +0800
Tag:    v2.2.2

Merge branch '22_MDL-31388_fix_enrol_LDAP_typo' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 0296cc13c70bc7487717dfe9bdf7fdb23ffcbcc6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:13:15 +0800
Tag:    v2.1.5

Merge branch '21_MDL-31388_fix_enrol_LDAP_typo' of git://github.com/gerrywastaken/moodle into MOODLE_21_STABLE

commit 841fcd871b1ef7fa53e2e6c958b76bf27998b282
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:10:52 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31532' of git://github.com/stronk7/moodle

commit cf6fa5025d1146b7a3de1cc891dd6b787e04f551
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:10:39 +0800
Tag:    v2.2.2

Merge branch 'MDL-31532_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit f2f3078cd3281daa3e0fab6f1d566ef4af94e1af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:10:31 +0800
Tag:    v2.1.5

Merge branch 'MDL-31532_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 6007f8d8d8de640aca5c904a0749ce50b2b4de9e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:04:45 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31381' of git://github.com/danmarsden/moodle

commit 5a91cf1e2a53119cdd41f1805845fe2195055ef2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 12:04:30 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31381' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit a77fbf44da992f83e55e0a7d58451079b9dfdbea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:58:36 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31432_messaging_popup' of git://github.com/andyjdavis/moodle

commit 3ba632dce5fad8ee31e774fe3b7ae9738273a961
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:58:20 +0800
Tag:    v2.2.2

Merge branch 'MDL-31432_messaging_popup_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 3921c7242dc6301074cb84220d133c6fcbaf1200
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:58:03 +0800
Tag:    v2.1.5

Merge branch 'MDL-31432_messaging_popup_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 52b2afa55366b2a1145a6c77fb9877c662043c97
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:53:21 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-30957_adding_assignment_completion_status_method_and_call' of git://github.com/gerrywastaken/moodle

commit 10701ea8147d7d59fdb785ea9d86fba3a46a7fce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:52:35 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30957_adding_assignment_completion_status_method_and_call' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 9169b3349f285e7609fa7f279cebdfc167fa5995
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:52:26 +0800
Tag:    v2.1.5

Merge branch '21_MDL-30957_adding_assignment_completion_status_method_and_call' of git://github.com/gerrywastaken/moodle into MOODLE_21_STABLE

commit 22fbfa3b2fcc6e6bad68d55dee5937855023cfca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:03:19 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31397' of git://github.com/danmarsden/moodle

commit 7654fe581170eb7caf896ae2dd36ba77da8f642a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:03:08 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31397' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit f1c1de8924f7217edf527ccd34f331ea0b7d09c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 11:02:59 +0800
Tag:    v2.1.5

Merge branch 'm21_MDL-31397' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 26fad611da22de781d810284487cfd155a591c6c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:57:12 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31652' of git://github.com/danmarsden/moodle

commit 34d7e1ce9b96225f9ef20676cd3a33470e8b3afa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:53:36 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31652' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 09c2f89a62a660eafea3282027f8b84448698e0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:53:23 +0800
Tag:    v2.1.5

Merge branch 'm21_MDL-31652' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 94057210027636746cb27c7f37750307bc1e54dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:49:41 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31659' of git://github.com/danmarsden/moodle

commit 3cb4c1e594f33ea5e7dbb11fba2d2a77cddc1c78
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:46:46 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30965-master' of git://github.com/ankitagarwal/moodle

commit 6f22c38b483be44c9ba2b7cf64c24fc3fbd0995c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:44:47 +0800
Tag:    v2.2.2

Merge branch 'MDL-30965-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 88b14f0fd0133ff42bc23546e27069693d8fc9ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:44:40 +0800
Tag:    v2.1.5

Merge branch 'MDL-30965-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 284814724b150952d6433396be18113ffb78bf94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:38:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31014-master-3' of git://git.luns.net.uk/moodle

commit 8f9c8186040fd2db1945b1a41c3f64bd224ff88e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:17:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31589-master-2' of git://git.luns.net.uk/moodle

commit 1498035f37aa64f7c7bfc490e7a923f1b3e4bc6c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 10:01:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31590-master-1' of git://git.luns.net.uk/moodle

commit 22bd2b93e510a5f8f29e4e5aac645124ec94c8ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 07:39:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31556' of git://github.com/rwijaya/moodle

commit a55688b394fc66589313c30680acb9599d0c52a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 07:39:02 +0800
Tag:    v2.2.2

Merge branch 'MDL-31556_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 06f405d6543d124b41d4b48ae7ae8c5276c987b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 07:38:54 +0800
Tag:    v2.1.5

Merge branch 'MDL-31556_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 6dce4aa1ba1e8028bb751ea8d934cfbbad28655a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 07:03:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31647-master' of git://github.com/sammarshallou/moodle

commit bc392be2a889940529de04a4d55e625e1e2e89c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 06:54:30 +0800
Tag:    v2.2.2

Merge branch 'MDL-31647-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit a80daaf26da18ad67aaf8ec9e45d925ecd944679
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 06:54:23 +0800
Tag:    v2.1.5

Merge branch 'MDL-31647-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit 06749fde07773cf1df98c035afdaf24be40bad10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 06:50:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30495' of git://github.com/mouneyrac/moodle

commit 11a3fcb1be094820a86efce9b47942074ce35d75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 06:50:39 +0800
Tag:    v2.2.2

Merge branch 'MDL-30495-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit b2444c0c452ad79279f305115c64ea0dbb416a87
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 06:50:29 +0800
Tag:    v2.1.5

Merge branch 'MDL-30495-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 9fdd4f7dc8bf4fc278d941e564d1e4ea8c9c70d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 06:37:59 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30971-master' of git://github.com/phalacee/moodle

commit bc5fbbb3cdbfdafc7f9b01df8d2dd5c2d834aea2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 05:32:08 +0800
Tag:    v2.3.0-beta

Merged branch wip-MDL-30521 with conflict resolutions

commit 3fe335c455d8c80f0c46fbbab767d5782894daf7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 05:29:46 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-30521-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit a005b98ba74d71d025735f2ed0f6179925862945
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Feb 2012 05:29:38 +0800
Tag:    v2.1.5

Merge branch 'wip-mdl-30521-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 124e846e833a7165947e786dae63c15645d89b92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 16 Feb 2012 10:40:38 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 889860576a5f83822f4c323cf046d8d5e19c98e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 16 Feb 2012 10:38:05 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle

commit 051806b2ee5e588c2c76bfc801b9982766cd8804
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Feb 2012 11:23:57 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-30388' of git://github.com/rajeshtaneja/moodle

commit 646704c8d074e912a74fb4e9533a9000be6e0282
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Feb 2012 11:23:33 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-30388-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit cf86dd8c204eb8859839a5ed4de8c59da88facda
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Feb 2012 11:23:24 +0800
Tag:    v2.1.5

Merge branch 'wip-mdl-30388-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 9e7ff1476cd07cd13b823cec39f815f25b47bd00
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Feb 2012 10:32:16 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30989' of git://github.com/rwijaya/moodle

commit f820701286d7bf9d8dd845b5a65f466d85114a98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Feb 2012 07:41:47 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31112_dndupload_folder_detection' of git://github.com/davosmith/moodle

commit b7bf2c3a192dc4933f11b528b6e604c5f7760878
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:41:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30911' of git://github.com/rwijaya/moodle

commit ebeacb73c9dbdebccf1374ac8bdf4f1e4f4717f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:41:45 +0800
Tag:    v2.2.2

Merge branch 'MDL-30911_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 9560a61be9928bb951e23c823a8cbfa1a495ebe6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:41:37 +0800
Tag:    v2.1.5

Merge branch 'MDL-30911_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 70a03e679efa40bff1413c8f6830caee1b35a4fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:16:21 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-30709-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_21_STABLE

commit 43c6a29cc6e7acde499df610ef3058065e0cf861
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:14:22 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-30709-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit d88f6dafdcd417d941546c4720e28ec0baaecb1f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:14:05 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30709-master' of git://github.com/marinaglancy/moodle

commit 1fa82cc1534b2a4a5b6cc692a93531a12bed8a70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:00:41 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30771-master' of git://github.com/marinaglancy/moodle

commit 01348282b4ccf393d421d65befc44d93c95c6e71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 12:00:25 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-30771-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit ba611bc025f114e3703c94c610a2e1bc1515588a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:54:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30688' of git://github.com/mouneyrac/moodle

commit 4e010423430311fedb2bef53f097a255634b0bde
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:53:46 +0800
Tag:    v2.2.2

Merge branch 'MDL-30688-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit ec22386a40a79087afe395b2613f0caabd5f2383
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:48:51 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31604-attempt3' of git://github.com/mouneyrac/moodle

commit 8348cea56a40230ce39407e0add19bd6c69b6264
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:48:09 +0800
Tag:    v2.2.2

Merge branch 'MDL-31604-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 0e373152be2360ab3afa036061875273b64e787b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:47:59 +0800
Tag:    v2.1.5

Merge branch 'MDL-31604-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 37ee40dc169cfef58e4b3da18de399932ef05a03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:32:12 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-26807_remove_withselectedusers_strings_and_references' of git://github.com/gerrywastaken/moodle

commit 5129af80515d984c523362f19138be0f5dc2496e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:32:00 +0800
Tag:    v2.2.2

Merge branch '22_MDL-26807_remove_withselectedusers_strings_and_references' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit a689533f8fcd7c8790b69bc73e3bc856e6025562
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:31:49 +0800
Tag:    v2.1.5

Merge branch '21_MDL-26807_remove_withselectedusers_strings_and_references' of git://github.com/gerrywastaken/moodle into MOODLE_21_STABLE

commit 7f68eb8e2cfd35ec7773315a9ae07704b2b8726d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:31:40 +0800
Tag:    v2.0.8

Merge branch '20_MDL-26807_remove_withselectedusers_strings_and_references' of git://github.com/gerrywastaken/moodle into MOODLE_20_STABLE

commit 928c3d54e64c2df116dee79be5f79f2e9a2872f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:29:17 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-27285_fixing_grammar_on_wiki_links_page' of git://github.com/gerrywastaken/moodle

commit a6f81e7fd86765dbf86a40b5f3a46c580d4fcb3c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:27:57 +0800
Tag:    v2.2.2

Merge branch '22_MDL-27285_fixing_grammar_on_wiki_links_page' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 8213be9838d081772e6ffb776485d41d650d2449
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:27:45 +0800
Tag:    v2.1.5

Merge branch '21_MDL-27285_fixing_grammar_on_wiki_links_page' of git://github.com/gerrywastaken/moodle into MOODLE_21_STABLE

commit 9de39056a6b6c05ed93537826dd76e28faa5347d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:27:36 +0800
Tag:    v2.0.8

Merge branch '20_MDL-27285_fixing_grammar_on_wiki_links_page' of git://github.com/gerrywastaken/moodle into MOODLE_20_STABLE

commit 2c4f43e1e75b0b33a092e851107282d011399338
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:21:20 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-27654_add_space_to_somefieldrequired_string' of git://github.com/gerrywastaken/moodle

commit af61dca6d05e9fae63bd2b8f838672fe57f42640
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:21:07 +0800
Tag:    v2.2.2

Merge branch '22_MDL-27654_add_space_to_somefieldrequired_string' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 79d0f68575992eef77eca7765af764c249bda756
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:20:59 +0800
Tag:    v2.1.5

Merge branch '21_MDL-27654_add_space_to_somefieldrequired_string' of git://github.com/gerrywastaken/moodle into MOODLE_21_STABLE

commit 573123929de4b7a51cde2174b2acf8fc6f78f3ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:20:49 +0800
Tag:    v2.0.8

Merge branch '20_MDL-27654_add_space_to_somefieldrequired_string' of git://github.com/gerrywastaken/moodle into MOODLE_20_STABLE

commit 03134095f9f9d3591497772598021884e60d0ebd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:12:22 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 9fd088b7929c2c1c1a874219381d9fbe2f50bce3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:12:09 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle

commit a750aff797d73f9543a4e6d9ff61855c82baa5ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:08:23 +0800
Tag:    v2.1.5

Merge branch '21_MDL-31107_fixing_below_typos' of git://github.com/gerrywastaken/moodle into MOODLE_21_STABLE

commit 908de866bd1ea2808774585f9e2b0c464614aa5d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:08:13 +0800
Tag:    v2.2.2

Merge branch '22_MDL-31107_fixing_below_typos' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 24768e4658c5a3e695940c8d83e7ded52cebd652
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 10:07:57 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-31107_fixing_below_typos' of git://github.com/gerrywastaken/moodle

commit fd20256bad463642aec5b344ad2846a1ac4bbc0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:59:22 +0800
Tag:    v2.1.5

Merge branch 'MDL-28283-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 01080b468fa24a29b9d346889a74646bc02d8ef5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:59:04 +0800
Tag:    v2.2.2

Merge branch 'MDL-28283-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit f2e8a66d862cd8aff6a0d02c4eb3fe30573c0d10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:57:30 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28283-master' of git://github.com/ankitagarwal/moodle

commit 0b07d7d4b8d5b2f95d4354c5cb353add1faaed48
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:45:04 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30815-master' of git://github.com/ankitagarwal/moodle

commit 66bd7ae432d0e2ec210d5bf10dcfd3053c6bc6b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:44:52 +0800
Tag:    v2.2.2

Merge branch 'MDL-30815-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 9bfa5bd8cc4587e74afe591195b0666d61115455
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:44:44 +0800
Tag:    v2.1.5

Merge branch 'MDL-30815-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 98899b998ca20d29c754309c980f0a5484b9d3a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:39:23 +0800
Tag:    v2.1.5

Merge branch 'MDL-30821-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit a7986c15cead57d766cac9ddb089500cd4805e09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 08:12:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31315-master-6' of git://git.luns.net.uk/moodle

commit caec8e44c089287f59d04a254ef619bb831352fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 05:56:27 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31515-master-1' of git://git.luns.net.uk/moodle

commit 17b0c930c6f08098fd0a07aeb79ed8ba02478a3b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 05:47:39 +0800
Tag:    v2.1.5

Merge branch 'MDL-29080_export_hidden2_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 2787eeb9b32575c175f27ac11a38b087d6473be9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 05:47:30 +0800
Tag:    v2.2.2

Merge branch 'MDL-29080_export_hidden2_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 66f5d0ea135c972adaab19e53bc691b183ee078e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Feb 2012 05:47:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29080_export_hidden2' of git://github.com/andyjdavis/moodle

commit 2ac8cf7a2093884e230251429a571c39a8324205
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:04:18 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-29153_fix_typo_in_resource' of git://github.com/gerrywastaken/moodle

commit bc967db3d45a17a5c99e96a7a4af093e0250da5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:04:06 +0800
Tag:    v2.2.2

Merge branch '22_MDL-29153_fix_typo_in_resource' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit f6a491d80582793cdf18f5173c64d4b6e19dc8f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:03:55 +0800
Tag:    v2.1.5

Merge branch '21_MDL-29153_fix_typo_in_resource' of git://github.com/gerrywastaken/moodle into MOODLE_21_STABLE

commit 76ef8d80f63588160551001739491d4aca9b6ab6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:00:35 +0800
Tag:    v2.3.0-beta

Merge branch 'm_MDL-30723_fixing_several_english_typos' of git://github.com/gerrywastaken/moodle

commit 877d9f8430b3993a2b651b8e14f088262d247a47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:00:23 +0800
Tag:    v2.2.2

Merge branch '22_MDL-30723_fixing_several_english_typos' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit e290039f9621d1ee96edb92a1b0dd4bd9c2b6299
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 13:00:13 +0800
Tag:    v2.1.5

Merge branch '21_MDL-30723_fixing_several_english_typos' of git://github.com/gerrywastaken/moodle into MOODLE_21_STABLE

commit bcce1ec1409b5f20c828fe6f79f6dca0a09616da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:52:48 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31085' of git://github.com/danmarsden/moodle

commit a87151d552b649f15e866ebdf8c0c75f6bc06d8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:52:36 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31085' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit c282f2aebd534e3df5426c3eb0db842b6e2f7a52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:48:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31502-master-2' of git://git.luns.net.uk/moodle

commit ac87f25829cd75151b5fece55d322830b7bb099b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:34:50 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-25185-master' of git://github.com/abgreeve/moodle

commit f7562f72fbd2deca46910cd91193659521fefd27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:34:39 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-25185-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit d66b3501fe3286a85f4e973939816702f19811d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:34:30 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-25185-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 3445e851044f386a03bcddb63f5cdb9a3b698da0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:34:22 +0800
Tag:    v2.0.8

Merge branch 'wip-MDL-25185-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE

commit 7eb1327487c542f24700c4edb5035ceca7f2989d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:34:09 +0800
Tag:    v1.9.17

Merge branch 'wip-MDL-25185-MOODLE_19_STABLE' of git://github.com/abgreeve/moodle into MOODLE_19_STABLE

commit 38d0571f239c36fcd6d4cbb261f6aff4d3ccee0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:17:29 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31396-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit f9fea1dbc47c5ba28083fc3ab61c33b09236b2cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:15:56 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31396-master' of git://github.com/abgreeve/moodle

commit 114824a6b9c3a2f4f017cddfb383b66f3faefa53
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:02:45 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31463-master' of git://github.com/abgreeve/moodle

commit ff60281e4fc4e2dea2787df026a2d81cd5d16b88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:02:32 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31463-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 7b53f7845933e7dedc6f9952d526d45f60999d3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:02:23 +0800
Tag:    v2.1.5

Merge branch 'wip-MDL-31463-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 69fd20dc1979bb2ee07731313b171728a0271de5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:02:15 +0800
Tag:    v2.0.8

Merge branch 'wip-MDL-31463-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE

commit 8b927cfb8bc15e6291bcf7e6749723233f2093b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 10:30:13 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-31576-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 38b0b2522eb573a238ceb357446d155dd534b5a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 10:30:05 +0800
Tag:    v2.1.5

Merge branch 'wip-mdl-31576-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit f53b63481f4076919ba43ac606081d09a3fb029a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 10:29:43 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-31576' of git://github.com/rajeshtaneja/moodle

commit 6cf1f978b2c2608a772cc1953befd3ac0822f07c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 10:28:26 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-31529' of git://github.com/rajeshtaneja/moodle

commit 5eb8ad61291b4be4f3e56a682719f0f374a5368d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 10:26:21 +0800
Tag:    v2.2.2

Merge branch 'MDL-31554_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit ea5ce02579d94440aaddd40673ca9fa307e97350
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 10:26:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31554' of git://github.com/timhunt/moodle

commit 834214386243d2e08dad46692caae65ea0f1a433
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 09:36:14 +0800
Tag:    v2.2.2

Merge branch 'MDL-25883-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit 4cb775dcff205b143e49790e975b6974a2767d3e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 09:36:04 +0800
Tag:    v2.1.5

Merge branch 'MDL-25883-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

commit 67e79df3e24371fefb76820a624906d244ca6613
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 09:35:47 +0800
Tag:    v2.0.8

Merge branch 'MDL-25883-20' of https://github.com/mackensen/moodle into MOODLE_20_STABLE

commit 645573cab38be7bf4bd4892c34e869e776111a65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 09:35:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-25883-master' of https://github.com/mackensen/moodle

commit dff66010be21f6403a12d972c165d436e988af8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jan 2012 13:53:56 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-30993' of git://github.com/rajeshtaneja/moodle

commit 887ec885b1d957e7d82908927a47284b190e6969
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jan 2012 10:29:22 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-30509_m22_slowcohort' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 8d624631c5bd461bf9231b2cf9b2e87d138a3153
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:29:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31205' of git://github.com/timhunt/moodle

commit d0c82a5609d1a74e87d9d26035d022d02b63448c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:28:38 +0800
Tag:    v2.2.2

Merge branch 'MDL-31205_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 9e63f744c1b192476443de6c64ca6cb9322ae1e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:07:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31189' of git://github.com/lazydaisy/moodle

commit 11942210a24e2086cf9e6cd55f2120d231d6a1ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:07:00 +0800
Tag:    v2.2.2

Merge branch 'MDL-31189_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 58eb3519ea746e68b08ac5bd16bac40d7ed6661f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:06:35 +0800
Tag:    v2.1.5

Merge branch 'MDL-31189_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit a04385870b392c699d469003efd0031f9eea2a50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:03:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31231' of git://github.com/lazydaisy/moodle

commit a67a3a8eecfe7ac6b5054b969e4380aacb98838d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:03:02 +0800
Tag:    v2.2.2

Merge branch 'MDL-31231_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 0f7c1c8c02ceb896be32320d0849e9747d4163bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jan 2012 11:02:42 +0800
Tag:    v2.1.5

Merge branch 'MDL-31231_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 235fcb6632cabe55be8990a9ee5dc0701f16b71c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 16:09:41 +0800
Tag:    v2.3.0-beta

Merge branch 'w04_MDL-31172_m23_fullpath' of git://github.com/skodak/moodle

commit d6c2f4639f1d987db8456edaa7945c65ab6d915f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 16:06:47 +0800
Tag:    v2.3.0-beta

Merge branch 'w04_MDL-31173_m23_restore' of git://github.com/skodak/moodle

commit d66223ea8d4a224503f93d1e8d8537f917998fc4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 15:38:06 +0800
Tag:    v2.3.0-beta

Merge branch 'w04_MDL-31177_m23_odsexport' of git://github.com/skodak/moodle

commit 6f421476a92608d90aa867dc0cbad10a0d016441
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 15:37:48 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31177_m22_odsexport' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 5d9e0f9291c9c53b43e6fbbb27cdc877d8468bfd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 15:35:34 +0800
Tag:    v2.1.5

Merge branch 'w04_MDL-31177_m21_odsexport' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit a56272cfc7176ff486a6149a01f960d1ab9c4b71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 15:27:43 +0800
Tag:    v2.3.0-beta

Merge branch 'w04_MDL-31178_m23_enrolledws' of git://github.com/skodak/moodle

commit 3c6d27b44bdeced759752a1b4753bafd8129f291
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 15:15:52 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31178_m22_enrolledws' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 86e73f89811ed1cbe8394294c3fde614553e5d9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 14:46:05 +0800
Tag:    v2.3.0-beta

Merge branch 'w04_MDL-31182_m23_messprefs' of git://github.com/skodak/moodle

commit f536a092d4bc4944f716f95eb6a9c21fa060c48b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 14:45:50 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31182_m22_messprefs' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit b70688316fffe0bf2b995dfb138dce77f130881a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 14:44:54 +0800
Tag:    v2.1.5

Merge branch 'w04_MDL-31182_m21_messprefs' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 458e91d8ca7e81c06380395887563474b6a6f5d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 14:35:26 +0800
Tag:    v2.3.0-beta

Merge branch 'w04_MDL-31186_m23_extprofiles' of git://github.com/skodak/moodle

commit d5d5ae432cd1f339c5a580ee3331aa100c7a152f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 14:31:48 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31186_m22_extprofiles' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit a16df720b135f438efa045bf6982aba411f1788c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 14:31:23 +0800
Tag:    v2.1.5

Merge branch 'w04_MDL-31186_m21_extprofiles' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit e24baafefc1b673a172e9ac6e61585d4911fc7b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 14:23:25 +0800
Tag:    v2.3.0-beta

Merge branch 'w04_MDL-31202_m23_emailvalidation' of git://github.com/skodak/moodle

commit 7a79813152b36412fc265ee8b301b16271fee18c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 14:14:50 +0800
Tag:    v2.1.5

Merge branch 'MDL-31330_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 8ce97182396873ea8eb7b1bffa0c330fb76dcca7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 13:13:10 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31324' of git://github.com/lazydaisy/moodle

commit 1a20b3494b84f8bddd713b6f7bb8b1c94d7d4f06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 11:48:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31077' of git://github.com/mouneyrac/moodle

commit cd5189e2661345e209396b21ad4fc787fdb2573a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 11:48:25 +0800
Tag:    v2.2.2

Merge branch 'MDL-31077-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit be9974120ec5910c084df30378f01b6a9a625377
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 11:28:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31329' of git://github.com/stronk7/moodle

commit c95efa393622d9ef7eadc6a66796f6d7bfa069d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 11:25:42 +0800
Tag:    v2.2.2

Merge branch 'MDL-31329_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit dccf4efb1dcf2b92b374da2e4e3bd672e6217722
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 11:25:14 +0800
Tag:    v2.1.5

Merge branch 'MDL-31329_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 2bea3cd8d17be459940677074b16b273c0c067f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 11:22:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31333' of git://github.com/stronk7/moodle

commit d4de3f22c1628f0a9747d117f8e4cd06eecbd1fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jan 2012 11:08:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31013-master-1' of git://git.luns.net.uk/moodle

commit d471e3f59d0594a82cb9e66fe6d84ec64f1a1920
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 17:00:00 +0800
Tag:    v2.1.5

Merge branch 'MDL-31095_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 1c1b04c99409313f6704985e01d0a8190cb7457a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:59:27 +0800
Tag:    v2.2.2

Merge branch 'MDL-31095_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit d36b5d1177e824f18331507d66a9e34154e25816
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:58:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31095' of git://github.com/timhunt/moodle

commit 8a9edd6dba26ac60973a93b1082d91ce7bab398f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:41:24 +0800
Tag:    v2.2.2

Merge branch 'MDL-31135_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 99eec460d747768d9ac743c4f49a4f5726b78bc9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:40:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31135' of https://github.com/timhunt/moodle

commit b1baa8a2f20301128de8321f14daddb93a48be6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:30:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31102' of git://github.com/timhunt/moodle

commit 282dcd3c0329a77154bdbd28ea6b3d84d4dc5f0b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:27:38 +0800
Tag:    v2.2.2

Merge branch 'MDL-31102_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 2d33f4e81cd47f52be315772b37801c301d22ca8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:26:32 +0800
Tag:    v2.1.5

Merge branch 'MDL-31102_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 3c7aef34927d0616daa034c7b477432e8362b295
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:17:28 +0800
Tag:    v2.3.0-beta

Merge remote-tracking branch 'skodak/w03_MDL-27165_m23_confirmed'

commit d5c88f9333a675dd0f534d705057e0c21cd3f205
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:17:09 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-27165_m22_confirmed' into MOODLE_22_STABLE

commit b24713d1ecb516983a43c7dbc4976d714ebfc8ee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 16:16:54 +0800
Tag:    v2.1.5

Merge remote-tracking branch 'skodak/w03_MDL-27165_m21_confirmed' into MOODLE_21_STABLE

commit e9d2492833d53531cc7cc97e398b90f6430061ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 15:12:02 +0800
Tag:    v2.3.0-beta

Merge remote-tracking branch 'skodak/w03_MDL-29102_m23_autogrouping'

commit 94a763cf9220da55f1b7f09d26b55a5233c8837f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 15:11:39 +0800
Tag:    v2.1.5

Merge remote-tracking branch 'skodak/w03_MDL-29102_m21_autogrouping' into MOODLE_21_STABLE

commit 199ba4286b98981a63e01baef44b4be831184d7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 15:11:07 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-29102_m22_autogrouping' into MOODLE_22_STABLE

commit c3027ddcd7a39dc76ad4054670e4d997420fc25a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 15:01:56 +0800
Tag:    v2.1.5

Merge remote-tracking branch 'skodak/w03_MDL-30891_m21_repository' into MOODLE_21_STABLE

commit 69136724f65ddca32b19df3cd6b1edd83803cdc2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 15:01:36 +0800
Tag:    v2.3.0-beta

Merge remote-tracking branch 'skodak/w03_MDL-30891_m23_repository'

commit f0987e98ad51035b91230d97a7ee69adcf3d9da5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 15:01:09 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-30891_m22_repository' into MOODLE_22_STABLE

commit 735d8ce2ce959557a9a324f6810185154925d1f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:56:06 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-30958_m22_yuissl' into MOODLE_22_STABLE

commit 0cfedcbba7c2e28f9f290a42191cd7356221104a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:55:52 +0800
Tag:    v2.3.0-beta

Merge remote-tracking branch 'skodak/w03_MDL-30958_m23_yuissl'

commit 371fa34ecc77c1118bc25d6015234e69a5c300c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:49:55 +0800
Tag:    v2.3.0-beta

Merge remote-tracking branch 'skodak/w03_MDL-31011_m23_loglinks'

commit 43812bf883f4b09f838092ddc9601be029d1bb09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:49:28 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31011_m22_loglinks' into MOODLE_22_STABLE

commit 6a57cb0cb03805c7e6afc96fa80aff5078e52c79
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:38:47 +0800
Tag:    v2.3.0-beta

Merge remote-tracking branch 'skodak/w03_MDL-31035_m23_identitynotice'

commit 6f960202e775a5c7bdcddb2294eb0a3a4671c1a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:38:36 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31035_m22_identitynotice' into MOODLE_22_STABLE

commit 1b8189276562829b577b3b294c693af85b16b3cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:35:30 +0800
Tag:    v2.3.0-beta

Merge remote-tracking branch 'skodak/w03_MDL-31117_m23_grouptodo'

commit ff65ab25c24410e90bf05ce969b21292451648dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:34:58 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31117_m22_grouptodo' into MOODLE_22_STABLE

commit a2734ca8d193b6100dee3485facbae2690a74aaf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:33:40 +0800
Tag:    v2.3.0-beta

Merge remote-tracking branch 'skodak/w03_MDL-31109_m23_maintenance'

commit ac0d9c6411cbcce5075d41124082a23107e56597
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:33:01 +0800
Tag:    v2.2.2

Merge remote-tracking branch 'skodak/w03_MDL-31109_m22_maintenance' into MOODLE_22_STABLE

commit 7255250c2c0a386722e7d1c3271224c8e30f5bdc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 14:30:43 +0800
Tag:    v2.3.0-beta

Merge remote-tracking branch 'skodak/w03_MDL-31092_m23_emailpass'

commit 8a4c5170a5e048a607cd14dd81b07cfa0af2b66b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 13:16:44 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31144' of git://github.com/lazydaisy/moodle

commit fbdc15536020551c8507f45588d002d4cdc55f55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 13:08:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31164' of git://github.com/lazydaisy/moodle

commit 1480ead173f1bb9ba15ee1655eaae12e7c1c8d55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 12:00:12 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31060-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit 55cf5f8e75b1c68f30516f2542902f4ee6429960
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 11:58:16 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31060-master' of git://github.com/marinaglancy/moodle

commit 864777cb73738d26827e2cbcb81ecb2302e4748a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 11:49:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31130' of git://github.com/timhunt/moodle

commit 2d48474f2a6fd2c46d5c200f254a41add16e221b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 11:48:50 +0800
Tag:    v2.2.2

Merge branch 'MDL-31130_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit e333be5d5d81728a5359edac6b2bbdf7e7f95407
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 11:46:10 +0800
Tag:    v2.1.5

Merge branch 'MDL-31130_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit d37d6e2a8e4d4b599de6d712b840b33a6b128176
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 11:31:24 +0800
Tag:    v2.3.0-beta

Merge branch 'moodleurl_out_as_local_url' of git://git.luns.net.uk/moodle

commit 5ba0697050e829f7c52f77574ce1d2ebffc07849
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 11:11:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31018-master-1' of git://git.luns.net.uk/moodle

commit 6bf567100abbabff345a68df5643161fafb67fb9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 10:59:41 +0800
Tag:    v2.2.2

Merge branch 'MDL-31040-MOODLE_22_STABLE-3' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit 66fe8d59c87b7812dc7b5a941e89ae878728fd6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 10:54:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31040-master-2' of git://git.luns.net.uk/moodle

commit dde7ab2d6ef9b2b68b87e9e5af79d3605f51ab1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jan 2012 10:52:13 +0800
Tag:    v2.1.5

Merge branch 'MDL-31040-MOODLE_21_STABLE-3' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 7dd813b948826ce725cfc66f21481d384fa537c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jan 2012 09:30:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-24394' of git://github.com/timhunt/moodle

commit 859624f26c14da6b1ca286c0266ebe9d8759f2de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jan 2012 09:30:22 +0800
Tag:    v2.2.2

Merge branch 'MDL-24394_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit c44874f2014f17b44e8b2f665754c09df405e8f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jan 2012 09:30:14 +0800
Tag:    v2.1.5

Merge branch 'MDL-24394_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 10c3c6d49cb0f56b637984fffb0f7e4a122e72a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jan 2012 09:26:36 +0800
Tag:    v2.2.2

Merge branch 'MDL-31019_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 44577c96d05c9fbdd679a7fd1dad7e789c7744c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jan 2012 09:26:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31019' of git://github.com/timhunt/moodle

commit 7d1655a5808f208f1766add6111c1ba33e9ab3a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jan 2012 06:52:09 +0800
Tag:    v2.3.0-beta

Merge branch 'dragdrop-for-master' of git://git.luns.net.uk/moodle

commit da744e0065cfe21c4f283a7b3080dd3888edb202
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 11:12:38 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-31005_m22_contextlevelname' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 2e40a94cff068bde791efae42e358fe5a6e7ea1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 11:12:24 +0800
Tag:    v2.3.0-beta

Merge branch 'w02_MDL-31005_m23_contextlevelname' of git://github.com/skodak/moodle

commit 7adf2140128c712ebb1d224d3457d6b1ae85c1b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 09:58:57 +0800
Tag:    v2.3.0-beta

Merge branch 'w02_MDL-30944_m23_cohortenrol' of git://github.com/skodak/moodle

commit 0e743da2b484862c1ec95c18df4d940094347fe0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 09:03:10 +0800
Tag:    v2.3.0-beta

Merge branch 'w02_MDL-30717_m23_usercreated' of git://github.com/skodak/moodle

commit 5dff4c565fe598358f640e127639bec88148377a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 09:03:00 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-30717_m22_usercreated' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit b48d180e396e2fe326f82f05c47bdc14e7bf371c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 09:02:48 +0800
Tag:    v2.1.5

Merge branch 'w02_MDL-30717_m21_usercreated' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 1bec282c065bd16c026fce4b5fd27fe12d3b0821
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 08:52:37 +0800
Tag:    v2.3.0-beta

Merge branch 'w02_MDL-30928_m23_deletetimes' of git://github.com/skodak/moodle

commit 995294dfa37a42fa237e8e08a86e6a1a2e5cb23e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 08:48:37 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-30928_m22_deletetimes' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 9b1ab847439c51b2794864954ea263fed3a585df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 08:02:31 +0800
Tag:    v2.3.0-beta

Merge branch 'w02_MDL-30969_m23_suspendedcsv' of git://github.com/skodak/moodle

commit cef1e7f444b47cc1b3924868a765368691456f82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 08:02:21 +0800
Tag:    v2.2.2

Merge branch 'w02_MDL-30969_m22_suspendedcsv' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit df121fb28768e3ca132de5ad46bb3d79c4ab1369
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 07:23:11 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31043' of git://github.com/danmarsden/moodle

commit 9b69f4a9c9cd66f3a905cff78c91db1a11d95ecf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 07:02:41 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30652-master' of git://github.com/ankitagarwal/moodle

commit ade2e5955ea78b1d9941532a222068cb79814135
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 07:00:22 +0800
Tag:    v2.2.2

Merge branch 'MDL-30652_m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 94a2296a8efd45fbddd0578f81f3a5cb00bd963d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jan 2012 06:52:29 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31000-master-1' of git://git.luns.net.uk/moodle

commit cf6d069afd9cd45b60d09c2474cb9c6a66d02b34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 Jan 2012 06:17:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31017' of git://github.com/stronk7/moodle

commit ffd621215212088b6f70a99e5466c84a7bef69d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 Jan 2012 06:17:13 +0800
Tag:    v2.2.1

Merge branch 'MDL-31017_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit aa6d8f0f75ee9a9e9b9ef479b0d20bbc6160d2d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 Jan 2012 06:16:58 +0800
Tag:    v2.1.4

Merge branch 'MDL-31017_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 3b53b85b473d921416ba03829c9d1c0331b18dae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jan 2012 05:58:03 +0800
Tag:    v2.3.0-beta

Merge branch 'w52_MDL-29917_m23_autocomplete' of git://github.com/skodak/moodle

commit 032d7039fdff34786c2b245520c701596a436cf2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jan 2012 05:58:01 +0800
Tag:    v2.0.7

Merge branch 'w52_MDL-29917_m20_autocomplete' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 5753b2da0ba0b9cdfa1b60438a085dafade07310
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jan 2012 05:57:58 +0800
Tag:    v1.9.16

Merge branch 'w52_MDL-29917_m19_autocomplete' of git://github.com/skodak/moodle into MOODLE_19_STABLE

commit 44d5c138a2db40ddb10737535a29a47ef9c6e47a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jan 2012 05:50:20 +0800
Tag:    v2.3.0-beta

Merged branch 'w52_MDL-30548_m23_suspenduser' of git://github.com/skodak/moodle.git with conflict resolution

commit 44141b188159fc21f973eaa0b3e7173817dd7c84
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 11:35:36 +0800
Tag:    v2.3.0-beta

Merge branch 'w52_MDL-30786_m23_todelete' of git://github.com/skodak/moodle

commit cd735560d34042aeba31b3f2d468ab5228b8bb40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 11:35:26 +0800
Tag:    v2.2.1

Merge branch 'w52_MDL-30786_m22_todelete' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit a187c1394e3fac97dfedc61c13765da4206e84e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 09:08:50 +0800
Tag:    v2.3.0-beta

Merge branch 'w52_MDL-30673_m23_loginautocomplete' of git://github.com/skodak/moodle

commit b19f834ada5b591d38b4cad2783202079c2b5b98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 08:05:22 +0800
Tag:    v2.3.0-beta

Merge branch 'w52_MDL-30809_m23_guestinstance' of git://github.com/skodak/moodle

commit eacb470338a2c55e1886a806bab4efcb6b93b57b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 07:49:06 +0800
Tag:    v2.3.0-beta

Merge branch 'w52_MDL-30924_m23_pspell' of git://github.com/skodak/moodle

commit 03edfee47506faaad76f8acc46bc3ab976194da0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 07:38:51 +0800
Tag:    v2.3.0-beta

Merge branch 'w52_MDL-30926_m23_blogassoc' of git://github.com/skodak/moodle

commit 466973a14334003efca8daa7009ebef526919cb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 07:26:14 +0800
Tag:    v2.3.0-beta

Merge branch 'w52_MDL-30934_m23_modules' of git://github.com/skodak/moodle

commit 19c6ff514ef6599761f554bfdc2b729058bd4aaa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 07:22:44 +0800
Tag:    v2.3.0-beta

Merge branch 'w52_MDL-30943_m23_adminreport' of git://github.com/skodak/moodle

commit d0a8d045516a41b512174b55183d06298971c79c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:26:02 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30802' of git://github.com/timhunt/moodle

commit 1243bf814b7fb121c8767e7d59f9b94dcf9f254b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:25:50 +0800
Tag:    v2.2.1

Merge branch 'MDL-30802_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit b1a17fadcfb79148b4c5ac71d76ece104003a9ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:25:40 +0800
Tag:    v2.1.4

Merge branch 'MDL-30802_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 929ea9ed6bd5cc2158f18aa0a3751d9e4db4396f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:23:13 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30766' of git://github.com/timhunt/moodle

commit e972cdc5adf7cac492d4b426c746b4e20a31be27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:23:00 +0800
Tag:    v2.2.1

Merge branch 'MDL-30766_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 1ed9377e7841b96dc957cd615415e07370f3950f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:22:50 +0800
Tag:    v2.1.4

Merge branch 'MDL-30766_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 221dd28b657ac397d8c72ab8840c1e50f30ffdca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:15:04 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30168_tim2' of git://github.com/timhunt/moodle

commit dc8d309c883d9ac656ab50bcf6678a7160d41d78
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:14:10 +0800
Tag:    v2.2.1

Merge branch 'MDL-30168_tim2_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 9b82d1b4d4116bc6524379fccb97fb6b7d894854
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:14:02 +0800
Tag:    v2.1.4

Merge branch 'MDL-30168_tim2_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit a46fe43ba2d43ee579e3e7e31c3ebaec45dc0b6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:12:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27200' of git://github.com/timhunt/moodle

commit 860848dca8974b023a7a43ac8437eb30cf2d5ee9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:12:01 +0800
Tag:    v2.2.1

Merge branch 'MDL-27200_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 19bfd159974921fab5a9f4021146a02395073c4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:11:53 +0800
Tag:    v2.1.4

Merge branch 'MDL-27200_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit f6b2946a06fc7770187203e2313fa8614628e63d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:09:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29266' of git://github.com/bostelm/moodle

commit 62ff78e6de720271b2599fd2c378c026849625a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:00:42 +0800
Tag:    v2.3.0-beta

Merge branch 'w52_MDL-13572_m23_messaging' of git://github.com/skodak/moodle

commit fe4abbe1800eb8fb39791b293106b477c89b493d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 05:38:04 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30868' of git://github.com/lazydaisy/moodle

commit e525c992ca862cd5bc67086c4122563ab28d27bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 05:30:41 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30601' of git://github.com/rwijaya/moodle

commit 03273b535779df69337701b4b2b95fb6122efe6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 05:11:58 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29821' of git://github.com/bostelm/moodle

commit ed569481a3edc61bdfc360002622015df6d454ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 05:09:11 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30706' of git://git.luns.net.uk/moodle

commit 01dcafd8d5c66c14aa4d2ccaa16aea3c7726e541
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 05:06:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30804-master-1' of git://git.luns.net.uk/moodle

commit 2fa7c29c06fc4d0e5564083f6b6ca7f18b628bdb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 05:02:18 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30805-master-1' of git://git.luns.net.uk/moodle

commit 39f8f2e181cacd24e411a7994a4aeed30fcae1dc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 04:57:23 +0800
Tag:    v2.1.4

Merge branch 'MDL-13572_validate_email_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 7f7d9ce6e88493113b264350f2ef79f51358bb8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 04:57:14 +0800
Tag:    v2.2.1

Merge branch 'MDL-13572_validate_email_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 4b8ae84cd01c706a31c24a7a7907b68966960f7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 04:57:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-13572_validate_email' of git://github.com/andyjdavis/moodle

commit 98b05c1ca7df7cae4070a8875e904772bfc0cdd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:45:06 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-18128-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit e0c00395b7c18b9a30f92c751a5072b0e843b8c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:44:34 +0800
Tag:    v2.2.1

Merge branch 'wip-MDL-18128-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 01856bf75e8678015d3cb201f74df42974387500
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:44:11 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-18128-master-version3' of git://github.com/abgreeve/moodle

commit 365b567f71a5808b4a1184e3ddbc115d99eb3339
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:21:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30639' of git://github.com/rwijaya/moodle

commit 965344c08f273ffd3b286d6f965f554fb7da10e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:21:08 +0800
Tag:    v2.2.1

Merge branch 'MDL-30639_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 4703fb429edd036895bee3679c2c7a5ea71bb2da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:20:56 +0800
Tag:    v2.1.4

Merge branch 'MDL-30639_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 3cd88ea638e2ac9756a0475494aabbb98ace3d4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 12:19:46 +0800
Tag:    v2.0.7

Merge branch 'MDL-28126_m20' of https://github.com/nebgor/moodle into MOODLE_20_STABLE

commit bbcde38b334ecbfa2a18b01b77a7e995b2c0d9f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 12:03:25 +0800
Tag:    v2.3.0-beta

Merged MDL-28126 with cleanup

commit 91af0d84312e1f9450fb69788281f61a6b6f6559
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 10:01:14 +0800
Tag:    v2.0.7

Merge branch 'MDL-29239_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 50a1735fe4b1e8aa21e13a394a32b47550d4687d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 10:00:57 +0800
Tag:    v2.1.4

Merge branch 'MDL-29239_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 6ff99dde45e9d9153989d5d63ae822148dc21523
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 10:00:41 +0800
Tag:    v2.2.1

Merge branch 'MDL-29239_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit cc688de44f193f3ae880446783e21cd6f026626c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 09:59:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29239' of git://github.com/rwijaya/moodle

commit a2aa081e73994dc96aaa2149fb68490ba0d422c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 09:31:02 +0800
Tag:    v2.1.4

Merge branch 'MDL-30704_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit db65026449cf7e443303d4b0190fdcf98dfaaafa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 09:30:27 +0800
Tag:    v2.2.1

Merge branch 'MDL-30704_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit aaee11b85d35c99dc2855a423bd5d739fe5f9404
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 09:30:15 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30704' of git://github.com/timhunt/moodle

commit 54a4d23d4351b10ad323dded232eab8012ef50e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 09:15:47 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30764-master' of git://github.com/sammarshallou/moodle

commit 0cba7c0408f54453c61170cc1831291b22491038
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 09:15:43 +0800
Tag:    v2.2.1

Merge branch 'MDL-30764-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit 7d97d3ac7e9362fee00f6a6ebce42bd378417092
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 09:15:35 +0800
Tag:    v2.1.4

Merge branch 'MDL-30764-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit f67911b6acd25624aef985d4eb96d56c787b305f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:39:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30760' of git://github.com/timhunt/moodle

commit 9f83ba0887bd0ed0cc7ea9bd86e0eed9a743cfe4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:34:53 +0800
Tag:    v2.2.1

Merge branch 'MDL-30760_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 0e9c5fbc89f5eddf5631fa35c1eca353d18731eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:34:37 +0800
Tag:    v2.1.4

Merge branch 'MDL-30760_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit eae0b9a9e3c72456f795c7b51deaac5f3f68c79c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:23:45 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30646' of git://github.com/timhunt/moodle

commit 6005434b55c2ec09da8644a8601cf8ff9086d39c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:21:11 +0800
Tag:    v2.2.1

Merge branch 'MDL-30646_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 57648d8d765e4da001e55032016a6a952d256e7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:20:57 +0800
Tag:    v2.1.4

Merge branch 'MDL-30646_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 834082292adafb903810e0f628316d1c6b26b158
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:20:38 +0800
Tag:    v2.0.7

Merge branch 'MDL-30646_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 85d7ec9052de8f42c2976c66ced7a132869a97fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:16:40 +0800
Tag:    v2.1.4

Merge branch 'MDL-29846_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit a8fb78b14245885a4394297ccabd92f2f71f7d37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:16:20 +0800
Tag:    v2.2.1

Merge branch 'MDL-29846_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 22c3690b9d5c39130affc04555dbe25dec5adf5c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:16:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29846' of git://github.com/timhunt/moodle

commit f8882018f2bf4663f2cac46d35301f69f378f4db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 07:08:23 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30787_m23_coursemodedit' of git://github.com/skodak/moodle

commit b3af6c110ae016403a809c9f2d02e14c3f2bb084
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 07:08:09 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30787_m22_coursemodedit' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit fc0d8f77f224e02079842a2ae30085550f442989
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:44:41 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-28948-master' of git://github.com/abgreeve/moodle

commit 4e77491aff2791e7817a3d4e535f41a211c4956b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:42:45 +0800
Tag:    v2.2.1

Merge branch 'wip-MDL-28948-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 490f178f04781e6eabd6a4e3cd4162153fd1c507
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:42:30 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-28948-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit ffcc16f52a23be39661af96c75ea495a763d25e3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:42:15 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-28948-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE

commit 8afed3b9fc32fef2553e20c9a7965ee74669ef03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:40:51 +0800
Tag:    v1.9.16

Merge branch 'wip-MDL-28948-MOODLE_19_STABLE' of git://github.com/abgreeve/moodle into MOODLE_19_STABLE

commit 5e928f2e7ebb2e3199641e51eedf57bf2f209ba9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:24:16 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30779_m23_dbtransfer' of git://github.com/skodak/moodle

commit 1a73fc9a244b53d10bee5593bb1bd5903c1a9888
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:21:35 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30765_m23_context' of git://github.com/skodak/moodle

commit 1f3933bee6010d5b2f8a2e75423435bef59fd928
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:09:27 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30765_m22_context' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 16e8ccaf5f40734c17107027bf2b4797cecacc11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:05:18 +0800
Tag:    v2.1.4

Merge branch 'w51_MDL-30697_m21_roleslink' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 136d4c09f3f68c11cc382fa50ff916f1dbfb39c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:04:33 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30697_m23_roleslink' of git://github.com/skodak/moodle

commit e7af814b0d36c64c889057f82a0d7208fe634490
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:03:59 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30697_m22_roleslink' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 415be0ff9410d5a6fe8c30685bdd998857581b4e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 11:26:01 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30789_m22_enrolupdatestatus' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 042efe1aa748c597233e4e061f897437f8995f31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 11:22:42 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30789_m23_enrolupdatestatus' of git://github.com/skodak/moodle

commit 7554371cd9b951aa3a289529bdb452bd0a4219eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 10:21:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30500' of git://github.com/lazydaisy/moodle

commit c3f90a5722a951ee3dfb1804fc9966eeb45f1819
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 10:06:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-37049' of git://github.com/jamiepratt/moodle

commit d613d7d78e5f50ca49b134573707624c426f4347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 10:05:42 +0800
Tag:    v2.2.1

Merge branch 'MDL-37049_22' of git://github.com/jamiepratt/moodle into MOODLE_22_STABLE

commit 3969853b1c10a4020306772c6be57363f1b387c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 10:05:20 +0800
Tag:    v2.1.4

Merge branch 'MDL-37049_21' of git://github.com/jamiepratt/moodle into MOODLE_21_STABLE

commit 92e72b0a86b4ccb03eca3a1e82a5a20b8f31afec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 09:17:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30683' of git://github.com/timhunt/moodle

commit 7c19940ca6843bf004e79f47b6901dd99716d074
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 09:14:55 +0800
Tag:    v2.2.1

Merge branch 'MDL-30683_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 0bc0394c8ffaaadfc4c46e974bd85529e1ae53d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 09:14:14 +0800
Tag:    v2.1.4

Merge branch 'MDL-30683_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit d0fe873623f496190e575691c521444c2ffd6898
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 07:28:52 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29176' of git://github.com/timhunt/moodle

commit ead158db7e96b67edde692262c3d57cd35a4ac76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 07:23:36 +0800
Tag:    v2.2.1

Merge branch 'MDL-29176_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit f158171c0bc6a49f8ea82bf43b9c7de649cfd506
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 07:23:05 +0800
Tag:    v2.1.4

Merge branch 'MDL-29176_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 90179a509359c709b34cc15fc9482bcf0bdec6fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:52:49 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30734' of git://github.com/timhunt/moodle

commit 3bcb2c1dff99a0869b24e16bb35528c3a381d5e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:52:32 +0800
Tag:    v2.2.1

Merge branch 'MDL-30734_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit dd98ec697cbf2dea8ce43927a3e87b2258d8d76a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:52:17 +0800
Tag:    v2.1.4

Merge branch 'MDL-30734_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 6ccf06637fb74d8e00ecbd9f88e5bf5264dba05a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:37:10 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30742' of git://github.com/timhunt/moodle

commit 265dbb3a54ae80744bef3de28b1d0b7b4df5a04e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:30:42 +0800
Tag:    v2.2.1

Merge branch 'MDL-30742_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 0006e0cfa13c883420b0dda429294292c4696f82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:30:23 +0800
Tag:    v2.1.4

Merge branch 'MDL-30742_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 2253ea25926d0093fde9f6d45fa6dc071cf90ea9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 05:53:57 +0800
Tag:    v2.2.1

Merge branch 'MDL-30744_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 09608abe56afc50fcd94eb9347950c843e359333
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 05:21:11 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30744' of git://github.com/timhunt/moodle

commit d854866de39dc3e3e088bbb71191e7b0a7314707
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 04:28:23 +0800
Tag:    v2.1.4

Merge branch 'MDL-30758_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 5ff8144cc8ad3e8c7a025617310e8ea674c64656
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 04:28:10 +0800
Tag:    v2.2.1

Merge branch 'MDL-30758_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit b53bea816790f434d0f9bdaf98005381caf8ba23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 04:27:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30758' of git://github.com/timhunt/moodle

commit 0142e3eec11cc72e731472d66553aef409eda443
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 12:22:26 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-30576' of git://github.com/mayankgupta/moodle

commit c5a4b44be6069535c7873d90bc293cc35c2c479e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 12:17:44 +0800
Tag:    v2.1.4

Merge branch 'MDL-27183_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 83688ab542c67409f66d4196fb3b33779986733e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 12:17:29 +0800
Tag:    v2.2.1

Merge branch 'MDL-27183_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit cd3061294ab116fa94688c88ba75c020f863f2f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 12:17:10 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27183' of git://github.com/timhunt/moodle

commit 0bb848f74ce46bd0dbc3edba696bcbe29546ca37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 10:29:40 +0800
Tag:    v2.1.4

Merge branch 'MDL-30585_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 5c1c0900a5f138202935c45bb0c2729a65b60507
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:26:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30463' of git://github.com/rwijaya/moodle

commit d4b584c5f6cd739a13cdcacf6231d83947bf8129
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:25:17 +0800
Tag:    v2.2.1

Merge branch 'MDL-30463_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit e6f195d0b44eaa77997678c5e70f24c6f9d76646
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:25:01 +0800
Tag:    v2.1.4

Merge branch 'MDL-30463_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit a3c0ea64af32c159edbc006bb2cdcf92e979d0df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:24:46 +0800
Tag:    v2.0.7

Merge branch 'MDL-30463_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit cd6ad1c1d347cc8eff4e271fef0d8fc401f6a517
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:08:37 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30140' of git://github.com/mouneyrac/moodle

commit 2f24a39b5ba86b7f953c988bc541dc59e6d8cb47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:08:21 +0800
Tag:    v2.2.1

Merge branch 'MDL-30140-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 3d2ac8024d3311619caf6ea39c94b48abf93ee45
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:08:07 +0800
Tag:    v2.1.4

Merge branch 'MDL-30140-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 302991ba371f7a923a0ae258e38b6fa3d3d7192d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 07:08:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30653-master-2' of git://git.luns.net.uk/moodle

commit 2a6811bb9db0cecab98e6333b84bf862769b980a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:26:34 +0800
Tag:    v2.0.7

Merge branch 'MDL-30689' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 746e7c4a5e8701440c90e9eae428a40af734373c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:20:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30677' of git://github.com/timhunt/moodle

commit b3463f416c72287dd11c32f7ea5de05f5613c968
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:20:04 +0800
Tag:    v2.2.1

Merge branch 'MDL-30677_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit d380faef5cd9f421dd15d90e9c40b925261f1f52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:19:51 +0800
Tag:    v2.1.4

Merge branch 'MDL-30677_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit b11d9dc5955795257057cc8683f3624de48b117e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:19:36 +0800
Tag:    v2.0.7

Merge branch 'MDL-30677_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 6508fbc37d19bf5017d720f760aa4ed5bbcf757d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:15:27 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30532' of git://github.com/timhunt/moodle

commit fc97bb98637f736728c549b2fdcc8f75994a39a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:15:08 +0800
Tag:    v2.2.1

Merge branch 'MDL-30532_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit e66237cdcf8e2fbd0da49ee42040828759e72f8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:14:54 +0800
Tag:    v2.1.4

Merge branch 'MDL-30532_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit de3e5df24f80f58c5251b1bafbbd26f2e30ec115
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:11:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30498a' of git://github.com/timhunt/moodle

commit 8c495ea4ee66d1c43dae1766386d3a3877658ccb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:11:21 +0800
Tag:    v2.2.1

Merge branch 'MDL-30498a_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit c50442d0d7e93fbad9e96ae68a3675bcc82d091e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:11:07 +0800
Tag:    v2.1.4

Merge branch 'MDL-30498a_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 3a4e0dd4d3385fb38f56a43928273096eb6b84cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:10:52 +0800
Tag:    v2.0.7

Merge branch 'MDL-30498a_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit bb0ece5a0c411828624dd47e810c43a247e57236
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:26:31 +0800
Tag:    v2.2.1

Merge branch 'MDL-27143_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 8d70e5cc74e463311fa91c4615929d2e55d69e54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:26:11 +0800
Tag:    v2.1.4

Merge branch 'MDL-27143_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 4a0b3e2a6214799e885abb85b4df2a3265602d5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:25:58 +0800
Tag:    v2.0.7

Merge branch 'MDL-27143_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 0ebb6ff5b8f7a6206ec5b25f806b6aef47ea8050
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:25:29 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27143' of git://github.com/timhunt/moodle

commit e79c09855ca853fab61d88b3f8d2a71e1fc8411b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:17:56 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30621_m22_protectdir' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 2b9131991f6df3b6e34d7532b34951e8b4d96c1b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:17:45 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30621_m23_protectdir' of git://github.com/skodak/moodle

commit 860f7f919526880f42541e8d19127ab396a01da2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:59:24 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-29117_m22_enrolnewcourse' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 9997c057a28b197ca0df1d89fcb9e62e01cb584d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:57:00 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-29117_m23_enrolnewcourse' of git://github.com/skodak/moodle

commit a3a3186770787fca49403a4b152ca3868be22e37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:41:00 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30292_m22_health' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 82da6c5c5fe511809534ef40a15805ae409f1d28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:40:47 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30292_m23_health' of git://github.com/skodak/moodle

commit 424f91c056bf4d57770f601174f4a07aef458740
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:37:39 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30364_m22_report' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 94db939f7c24f73342575403f15bccedcfe6bc4c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:37:27 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30364_m23_report' of git://github.com/skodak/moodle

commit 0e3e2c82dde097d0d5dfa9c0e16922819a176b14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:29:11 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30415_m23_yui2rollups' of git://github.com/skodak/moodle

commit bbf9358c4957991e530541a7839b28e9d471992f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:24:14 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30502_m23_ldapenrol' of git://github.com/skodak/moodle

commit 860551428c35d226e3752efbe139e7b47b4c9760
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:15:16 +0800
Tag:    v2.1.4

Merge branch 'w51_MDL-30588_m21_switchrole' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 653599b3a4918f699bc4c3ddbd6ab3eebdd1c9f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:14:58 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30588_m22_switchrole' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 07ae3349fc76695abdb3b5be310e8793fdda2aba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:10:58 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30588_m23_switchrole' of git://github.com/skodak/moodle

commit dfda3efcc88c854e4c57973c2006d6117e7fb912
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 11:37:36 +0800
Tag:    v2.1.4

Merge branch 'w51_MDL-30659_m21_yuidebug' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit ba9489ce912fb4b8fcc463aa43eefa6a5762210e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 11:37:03 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30659_m22_yuidebug' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 16fdb8d070cc0fdc9c645e15ee225a25782a3dd1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 11:36:51 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30659_m23_yuidebug' of git://github.com/skodak/moodle

commit 6aabb69f9e593aa3e1c18ad9379f04dadb828058
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 11:10:19 +0800
Tag:    v2.2.1

Merge branch 'w51_MDL-30687_m22_ldapnewcourse' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 3a6e1e2b78e5767f0b6ddce992a412afe75540b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 11:10:05 +0800
Tag:    v2.3.0-beta

Merge branch 'w51_MDL-30687_m23_ldapnewcourse' of git://github.com/skodak/moodle

commit 16a6377ca8f9ea9c6bbbb9e279157178d24fc072
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 10:13:21 +0800
Tag:    v2.1.4

Merge branch 'MDL-29942-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 02af5654f2cb15105d79fc1bbe9c2be1ca500951
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 10:13:01 +0800
Tag:    v2.2.1

Merge branch 'MDL-29942-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 0669a9e9ae965e7da5e1dc6e3e0d97d01e29aed1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 10:12:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29942' of git://github.com/mouneyrac/moodle

commit 1114c49f51f052e21646c398891717a3aa37ba59
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 09:57:09 +0800
Tag:    v2.0.7

Merge branch 'MDL-28180_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 1ac4f0edbcf1cea05f22d4a85cc84e350f96f86f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 09:56:52 +0800
Tag:    v2.1.4

Merge branch 'MDL-28180_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 4e8da675ac5ae0761aff112a7dcd9663be75f06c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 09:56:40 +0800
Tag:    v2.2.1

Merge branch 'MDL-28180_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 273e24ffa45e00c4ff7252149c6134076bed2a8c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 09:54:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28180' of git://github.com/stronk7/moodle

commit d3054582d5738a6d76ea357f49b396562e69dd3a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 08:57:40 +0800
Tag:    v2.2.1

Merge branch 'MDL-30198-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 494b8a8596fed2f1f3dc4f0fc31ff2df068fec02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 08:57:23 +0800
Tag:    v2.1.4

Merge branch 'MDL-30198-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit d35fc666d69deba29a0959e01b94c21595ffc00d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 08:54:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30198-master' of git://github.com/ankitagarwal/moodle

commit ffdbcf3998461e06278c5efbd6a4b5a185aaa7e3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 08:50:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29195-master-1' of git://git.luns.net.uk/moodle

commit c4a91d06701d7b5c20c88c32269fff64e8bd7747
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 09 Dec 2011 06:43:41 +0800
Tag:    v2.0.7

Merge branch 'MDL-30660' of git://github.com/timhunt/moodle

commit 1921ff62f249febbdf75e0463ca617bfa6a25efc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 09 Dec 2011 06:43:41 +0800
Tag:    v2.1.4

Merge branch 'MDL-30660' of git://github.com/timhunt/moodle

commit e0745be16b7a684c257a34ccd7bed187ef57ecb0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 09 Dec 2011 06:43:41 +0800
Tag:    v2.2.1

Merge branch 'MDL-30660' of git://github.com/timhunt/moodle

commit f8b2e5458d16f3b9835cd21b36788b5352f1e778
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 09 Dec 2011 06:43:41 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30660' of git://github.com/timhunt/moodle

commit 9c6b40c614aa8416c6b1aefa4cfd649959e636b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 11:05:26 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30518' of git://github.com/mackensen/moodle

commit 78baf38ea4d9de59157a9a57de93c466bf9b5de2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 11:05:08 +0800
Tag:    v2.2.1

Merge branch 'MDL-30518' of git://github.com/mackensen/moodle into MOODLE_22_STABLE

commit 4bd1fc7ef74995a794f73e2516e8085020c067cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 10:50:42 +0800
Tag:    v2.3.0-beta

Merge branch 'w50_MDL-30528_m23_enrolroleid' of git://github.com/skodak/moodle

commit a33d85b3744b55ca085c75e3dcbd2b650cccb7a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 08:50:03 +0800
Tag:    v2.2.1

Merge branch 'w50_MDL-30623_m22_guest' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 8e0169ebc28162ad77444118b53cbe3cb27d0aec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 08:49:39 +0800
Tag:    v2.3.0-beta

Merge branch 'w50_MDL-30623_m23_guest' of git://github.com/skodak/moodle

commit 3b1a4a0d55173ce7f99ebd0ad6e7c89428b02c3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 07:42:20 +0800
Tag:    v2.0.7

Merge branch 'MDL-29712-MOODLE_20_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_20_STABLE

commit 2fbbfb0187de0fcc9677f2e24f10c0384bcbd936
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 07:41:59 +0800
Tag:    v2.1.4

Merge branch 'MDL-29712-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 073b19a2813ce489d2004d0e717565caf13d2f1c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 07:41:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29712' of git://github.com/mouneyrac/moodle

commit 2316dcf0a8733a8ba95a016850c70db10fb40bdc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:47:59 +0800
Tag:    v2.0.7

Merge branch 'm20_MDL-30211' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 8305bb680fc3ac6fa7d6005eca22afeb4e3c97d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:47:43 +0800
Tag:    v2.1.4

Merge branch 'm21_MDL-30211' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 871c2e15c7876ef2cbd12d111a82f05e01221074
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:44:47 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-30211' of git://github.com/danmarsden/moodle

commit b6965b11fcc25791669023b6b2da65b04fdb084a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:39:02 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-30536' of git://github.com/danmarsden/moodle

commit b1d4c42ad698b45700b2cc6e1d830b91d3913b6f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:22:58 +0800
Tag:    v2.2.1

Merge branch 'MDL-28282-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 74482042ac6da0219f1f2523743655667ecf5bf8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:22:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28282-master' of git://github.com/ankitagarwal/moodle

commit c629cfae58524e2d6144e6460b4dbde36187953b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:19:53 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL28588' of git://github.com/ankitagarwal/moodle

commit 7f96df6222e9fb1500843beafdffee410e5f96c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:19:22 +0800
Tag:    v2.2.1

Merge branch 'MDL-28588-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 51994346197f49c233f607d05face71db2f43115
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Dec 2011 09:20:48 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-19147-master' of git://github.com/abgreeve/moodle

commit effe15308bed53e90be205fd551bddf41049ac91
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Dec 2011 09:20:15 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-19147-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 8eaf6d689b0916d6435920b4e588b6504952e816
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Dec 2011 09:20:03 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-19147-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE

commit e114543f690b2e578a9c3205f88443d95d4da345
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Dec 2011 09:19:45 +0800
Tag:    v1.9.16

Merge branch 'wip-MDL-19147-MOODLE_19_STABLE' of git://github.com/abgreeve/moodle into MOODLE_19_STABLE

commit 40f4b5c562a83f3c4da410d7886d5a7a31363211
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Dec 2011 07:38:51 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-19147-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 6416c6c25b56427c1157c21f5d61e04d663aa83f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 12:14:52 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30007' of git://github.com/stronk7/moodle

commit ebaa82b5da325321a19f35e056a182f26b3e121b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 10:49:10 +0800
Tag:    v2.0.7

Merge branch 'wip-mdl-30421-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 280dc8bd45c57b17130769fcdb9e67a2269d70c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 10:48:56 +0800
Tag:    v2.1.4

Merge branch 'wip-mdl-30421-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 7bebeb2a29c58a2c5c1a3ab4b92b4e57e5f9f2b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 10:48:20 +0800
Tag:    v2.2.0-rc1

Merge branch 'wip-mdl-30421' of git://github.com/rajeshtaneja/moodle

commit 0e1cdd9e4309eb82bb733dd78d24c61a8bc9e89a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 10:19:56 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-30469-MOODLE_20_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_20_STABLE

commit be4ee6dcb1f5779b7c993c3237097e0313397fe9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 10:19:32 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30469-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_21_STABLE

commit bba1338a60c1306fb3dd85fbca78d0d9c4ec4244
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 09:43:39 +0800
Tag:    v2.2.0-rc1

Merged branch 'MDL-30459' of git://github.com/mouneyrac/moodle.git with whitespace fixes

commit 63a07688884ffc890a86cdfbc37eb9d4a6cb253e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 09:16:19 +0800
Tag:    v2.2.0-rc1

Merge branch 'wip-MDL-30376-master' of git://github.com/phalacee/moodle

commit c3f185949fd8481e0f1a41fec83c2c77fecb7c8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:44:09 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30526' of git://git.luns.net.uk/moodle

commit 088b648cccc20b4c06045353cad67cf4175a597a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:29:57 +0800
Tag:    v2.0.7

Merge branch 'MDL-29730_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 71f5d75a463e4bbbbd4b4627737172df7ee3e4c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:29:38 +0800
Tag:    v2.1.4

Merge branch 'MDL-29730_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit e8c3f32f83b7672cc332c4970bae25d5a058fc46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:29:19 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-29730' of git://github.com/rwijaya/moodle

commit bd87b71c4df50614a085349eea5e8177c4d37598
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:16:23 +0800
Tag:    v2.0.7

Merge branch 'MDL-30453-exassessment-link_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit fd2aab6c9df59c1ccba64176bdc7f3138635c08b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:16:02 +0800
Tag:    v2.1.4

Merge branch 'MDL-30453-exassessment-link_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit c9c7b8fb0b9e52bf6a9c4deefb3c2ec9c94b1f7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:15:29 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30453-exassessment-link' of git://github.com/mudrd8mz/moodle

commit 6c5ba86e356e1d06f424c5f58051b7ba47700297
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 06:50:24 +0800
Tag:    v2.0.7

Merge branch 'MDL-30271-switch-role-workshop_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 494b6c9e395bda6d3b07393c6c30c8bb525ff3ee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 06:49:45 +0800
Tag:    v2.1.4

Merge branch 'MDL-30271-switch-role-workshop_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit fa6765cf9c8a07fd2c6ddbbe7775318e1b03fb7f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 06:48:55 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30271-switch-role-workshop' of git://github.com/mudrd8mz/moodle

commit 0a9b7c2b6d781651f5bd232360c760ba984a9766
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 08:04:37 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30440-master' of git://github.com/ankitagarwal/moodle

commit 4117b4fcd8fd46ca1000d107722118c395f9c50b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 08:02:15 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30322' of git://github.com/timhunt/moodle

commit 0c0d5011446f4e6fd13b00ba0c43eabed511dec4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:49:40 +0800
Tag:    v2.2.0-rc1

Merge commit 'FETCH_HEAd'

commit 7708c82e72a8f9c1a3cfbd809c0546a51be0e54e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:44:20 +0800
Tag:    v2.1.4

Merge commit 'FETCH_HEAd' into MOODLE_21_STABLE

commit de8b419b608bdd728f806e6926b7990e1a21307b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:43:18 +0800
Tag:    v2.0.7

Merge commit 'FETCH_HEAd' into MOODLE_20_STABLE

commit dc558d2882c9860a2b13d3713cb736efd05cf634
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:37:49 +0800
Tag:    v2.0.7

Merge branch 'MDL-30287_grader_ajax_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 2fff9611fa4cae6fb0f203c1e04de2c686acbac2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:37:36 +0800
Tag:    v2.1.4

Merge branch 'MDL-30287_grader_ajax_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 3ddbd75accae05cfbd460ffd168e966a05414015
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:05:46 +0800
Tag:    v2.2.0-rc1

Merged branch 'MDL-30505' of git://github.com/lazydaisy/moodle.git with conflict resolution

commit fb056a811ecd0179e75d1368079cc95526589848
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:56:29 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30302-master-2' of git://git.luns.net.uk/moodle

commit 9ac82391a27bbd170435c3e7a88b793f8a215463
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:52:50 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-26240' of git://github.com/lazydaisy/moodle

commit 925ae958241e34192bf488a8bea53f05ab44fe92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:46:47 +0800
Tag:    v2.2.0-rc1

Merge branch 'wip-MDL-30273-master' of git://github.com/abgreeve/moodle

commit 921383f789c6d70a4ab9c5cc481a6265ca09fcae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:41:38 +0800
Tag:    v1.9.16

Merge branch 'wip-MDL-30273-MOODLE_19_STABLE' of git://github.com/abgreeve/moodle into MOODLE_19_STABLE

commit 7231e48c27af1e92c497f4752dfe8a6c650c7fa0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:41:07 +0800
Tag:    v2.0.7

Merge branch 'wip-MDL-30273-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE

commit d21cf5744d39285a265001c2dee088d25da4d009
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:40:16 +0800
Tag:    v2.1.4

Merge branch 'wip-MDL-30273-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit e343ff6a5d48b660002502256a27264d9e053a2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:28:24 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30471' of git://github.com/lazydaisy/moodle

commit e68fa2500aaae1c25ce7649726f3e0c5e2a6def5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 10:16:27 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30347' of git://github.com/stronk7/moodle

commit bada16d35cf4a4e9498c545930c3886af53345f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 08:51:25 +0800
Tag:    v2.2.0-rc1

Merged branch 'wip-MDL-30361-master-rtlpatches' of git://github.com/nadavkav/moodle.git with changes

commit c3689810d5e9742938a6bfd3af8a930a63d63bc7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:55:22 +0800
Tag:    v2.1.4

Merge branch 'w48_MDL-30448_m21_urlpar' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit ac386aa92569e52d30d633e59024b5f658a4e4a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:54:49 +0800
Tag:    v2.2.0-rc1

Merge branch 'w48_MDL-30448_m22_urlpar' of git://github.com/skodak/moodle

commit beb684ba11ea0b02d49df53e51dd0adf18bd3792
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:21:39 +0800
Tag:    v2.2.0-rc1

Merge branch 'w48_MDL-30457_m22_deluserspictures' of git://github.com/skodak/moodle

commit 5c0b8ea3f152a4d9e6b6eaef9e2d2586bdd114a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:13:27 +0800
Tag:    v2.2.0-rc1

Merge branch 'w48_MDL-30467_m22_delusers' of git://github.com/skodak/moodle

commit 77da06ceb4285c8534428d0e5c4480653b0cb21f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 08:13:06 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30422-master' of git://github.com/ankitagarwal/moodle

commit b40a3260612a590b46671ea63fc016ff39248b7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 07:45:07 +0800
Tag:    v2.0.6

Merge branch 'MDL-26431-20' of git://github.com/totara/moodle into MOODLE_20_STABLE

commit 1ed6756d80ac935ce9d046551a383559be59a80f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 07:44:39 +0800
Tag:    v2.1.3

Merge branch 'MDL-26431-21' of git://github.com/totara/moodle into MOODLE_21_STABLE

commit e1a236015c64ae9353c1b6b718bcbc9ba33bd78c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:59:42 +0800
Tag:    v2.0.6

Merge branch 'MDL-29115_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit c3ef0a618dd97558e31e74d258a2f109f9181991
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:59:18 +0800
Tag:    v2.1.3

Merge branch 'MDL-29115_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit d905b69e95d675e032f4f93ce6afe1f86cb254c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:53:24 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-29115' of git://github.com/rwijaya/moodle

commit 3174abc728a305ec5638cec116f22b98bb444ad4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:36:26 +0800
Tag:    v2.1.3

Merge branch 'wip-mdl-30391-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 7355a8e4b7de6eb6caeb0d7871da89b77be2ce09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:29:33 +0800
Tag:    v2.2.0-rc1

Merge branch 'wip-mdl-30391' of git://github.com/rajeshtaneja/moodle

commit b674092416c7c2cf0b56511a6554f634df0f581e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 11:52:08 +0800
Tag:    v2.2.0-rc1

Merge branch 'dev_MDL-29476_ws_participants_master' of git://github.com/dongsheng/moodle

commit 1ee341b3d1ec588245445cca71095f7bf85e0a9b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 09:20:34 +0800
Tag:    v2.0.6

Merge branch 'MDL-30192_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit f99bd07ab6a48465d899d895777ec2a62db22fe6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 09:20:10 +0800
Tag:    v2.1.3

Merge branch 'MDL-30192_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit b8a2a92773fc7a003b44708b9aabde6eb22f3992
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 09:11:23 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30192' of git://github.com/stronk7/moodle

commit d019d13ea1545203d5daeb2583e5eb1ac4f9989b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 08:58:15 +0800
Tag:    v2.0.6

Merge branch 'MDL-29904-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit aa1d8c5cdee9f3704a33cb0b63a53317504af3dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 08:57:38 +0800
Tag:    v2.1.3

Merge branch 'MDL-29904-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit ba54648b45b44f2f685d124dadddb714d35b523a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 08:54:26 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle

commit f2d11739a8dea0ea19c32b8c82b41f18935ed347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 07:41:24 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30393_2' of git://git.catalyst.net.nz/moodle-r2

commit b2d3e5cc493c382a1836f3f7c5c0c3b75d731756
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 07:17:14 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30303_m22_mimeinfo' of git://github.com/skodak/moodle

commit 15415bf8e8682e618f32774496872d9de95a37f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 05:57:38 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30403_m22_upgradedocs' of git://github.com/skodak/moodle

commit 4236448a19a1837f3cc76e060ac7fcdc4a43cb8d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 13:28:30 +0800
Tag:    v2.1.3

Merge branch 'MDL-28629_MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit f68144c177664fd2002f19ebe2f847d87a94bd7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 13:28:11 +0800
Tag:    v2.0.6

Merge branch 'MDL-28629_MOODLE_20_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_20_STABLE

commit b28de4b412c9cd37b12324749789dc97e4d6ca39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 13:26:35 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-28629' of git://github.com/mouneyrac/moodle

commit 63526f3e9be473b658888becc7a5707025cf8f54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 07:59:52 +0800
Tag:    v2.0.6

Merge branch 'MDL-30392_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 27bc2953827ec7114a07f768448a168e7057e220
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 07:59:37 +0800
Tag:    v2.1.3

Merge branch 'MDL-30392_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit f5d0ac107758502255f165fd18f285c36cad48e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 07:59:19 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30392' of git://github.com/stronk7/moodle

commit 495bcb06d14e453298d209a317ba7c60e235463b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 05:39:02 +0800
Tag:    v2.2.0-rc1

Merge branch 'wip-MDL-30270-master' of git://github.com/marinaglancy/moodle

commit 919423fc6cf74ff4db96e67545296511a2f38fbe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 08:32:55 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30228_m22_pdftestcopyright' of git://github.com/skodak/moodle

commit 28e6598dff156cf6edb2e675ab4f0cd6855e5c93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:48:06 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30294_m22_errorsinthemefiles' of git://github.com/skodak/moodle

commit 67c768dbe8a9e2dff95ddd010a9f1d25ec2e7c08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:39:42 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30308_m22_reqstrict' of git://github.com/skodak/moodle

commit 4f0596f874caa3a757eba951f4aea88afb377a78
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:23:32 +0800
Tag:    v2.2.0-rc1

Merge branch 'plagiarismbranch' of git://github.com/peterbulmer/moodle

commit 291029dfd546b934a844a9569f4155d47b8730bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:01:45 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30309' of git://github.com/lazydaisy/moodle

commit 34e05996c189359c50d65ae68608887e7ef93d54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 06:53:45 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30319' of git://github.com/lazydaisy/moodle

commit b8c117e1267b42ee7ef2098903d96c8067a4c209
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 06:48:47 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30327_m22_blockconfig' of git://github.com/skodak/moodle

commit 7cdf3904a7c32478121429a8e9d5c894142c40f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 05:28:32 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30359' of git://github.com/lazydaisy/moodle

commit 02c43cd86a277471af0bdfe36d1dd5b002fcb94b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 09:54:27 +0800
Tag:    v2.1.3

Merge branch 'MDL-24577-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit b750c6b3884ea3ba33ffdd4040e44bf1fd8a20b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 09:53:38 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-24577-master-1' of git://git.luns.net.uk/moodle

commit 28ab9dbe98305c69dea8758afb7251076ec9479b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 08:11:46 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-29893-master' of git://github.com/ankitagarwal/moodle

commit 5174eeebe3bac77c9dd4e92cf8dc4dda220cd4b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 08:10:53 +0800
Tag:    v2.0.6

Merge branch 'MDL-29893-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE

commit 18b7d189595214b4c62a756ccfc39232a0568ecb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 08:07:33 +0800
Tag:    v2.1.3

Merge branch 'MDL-29893-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 1ae9aa2b8f2ccb5a696378736039a24a85fb9713
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 17:01:05 +0800
Tag:    v2.2.0-beta

Merged MDL-29108 Advanced grading

commit c0e1de9b0062442819a647bfe4721fd1187d8431
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 12:51:06 +0800
Tag:    v2.0.6

Merge branch 'MDL-28670_m20' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit fcd27b4981a1b7b49aff086c681d1aa9919a3c9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 12:50:47 +0800
Tag:    v2.1.3

Merge branch 'MDL-28670_m21' of git://github.com/nebgor/moodle into MOODLE_21_STABLE

commit 364fe13b11b9a668ccb36f4bdb66679ba871fb83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 12:49:47 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28670' of git://github.com/nebgor/moodle

commit 06b4c6e13a506c4cc8eab0b5877be782239301bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 07:14:47 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-30010-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit 6335838604b8b13cbc0a51e299079895ca405221
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 07:10:17 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-30010' of git://github.com/lazydaisy/moodle

commit 025d304ad3f162018fd5ef48a021dc6813cc5b11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 11 Nov 2011 13:35:13 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27622-master' of git://github.com/samhemelryk/moodle

commit e3dfd1a1d96c5f60822d6a13a23e8ffa430f4b1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Nov 2011 05:15:50 +0800
Tag:    v2.2.0-beta

Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution

commit 7d99144e83125433bea233c475473d9fe9529fb8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Nov 2011 04:41:38 +0800
Tag:    v2.2.0-beta

Merge branch 'w44_MDL-30150_m22_pagetypefrankenstyle' of git://github.com/skodak/moodle

commit ee16b8af347a6704e7b3fadbb456dd99b57c8b28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 08:10:00 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-25823' of git://github.com/rwijaya/moodle

commit 2331e2edddd442f5c86f9d198b75da603bcda331
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 08:09:44 +0800
Tag:    v2.1.3

Merge branch 'MDL-25823_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 7352bbbc6a24963ae41b7bf5fdb1242e3ec3a9d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 08:09:29 +0800
Tag:    v2.0.6

Merge branch 'MDL-25823_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 195ad02f4ab34d1665492a9c24c2d42cecb1c268
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 08:00:00 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-30059-master' of git://github.com/phalacee/moodle

commit c2d7c2296209f2be3ae789172a21cc633b03e01e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 07:05:39 +0800
Tag:    v2.1.3

Merge branch 'wip-MDL-30059-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit 3fb3517a002185250af9b70e2e4b9954d7cfba1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 07:02:59 +0800
Tag:    v2.1.3

Merge branch 'MDL-2942-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 7f5380be082f4c48cb6bff70b54b22c6fe0ad4f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 07:00:42 +0800
Tag:    v2.0.6

Merge branch 'MDL-29420-m20' of git://github.com/ankitagarwal/moodle into MOODLE_20_STABLE

commit 3e4fb0cf81b2f33aca5656d6aca99b9b565d94d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 06:58:10 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-30044-master' of git://github.com/ankitagarwal/moodle

commit daa1ed26cfe4d6f6760af1dfb8b5ba9d2216c61a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 05:57:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-30175' of git://github.com/stronk7/moodle

commit 68bcca4d04fa953581ba9e6183f465e2237ffdd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 07:24:26 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-28292-master' of git://github.com/phalacee/moodle

commit fb09c60c5e22f9818050ee05f715c26686147c4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 07:24:21 +0800
Tag:    v2.1.3

Merge branch 'wip-MDL-28292-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit fb3bf9a0d2acba2e242ee11ce9e76928284e0941
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 07:24:15 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-28292-stable20' of git://github.com/phalacee/moodle into MOODLE_20_STABLE

commit a82a42b6c1bcd070c502e6a6470d5d3a3823d74f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 06:58:44 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle

commit 0abe89f7b4cf1ec5c028c3dd6b78b74641523607
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 06:41:31 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29955' of git://github.com/rwijaya/moodle

commit ace2712e43ae6b051a7088716231a4e4837843a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 06:41:25 +0800
Tag:    v2.1.3

Merge branch 'MDL-29955_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 57b290b458002d1933909ef06c611d69dcd4e109
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 06:41:18 +0800
Tag:    v2.0.6

Merge branch 'MDL-29955_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit f94d606f1f2070725dd015a91ba6812045c96073
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 12:36:50 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29964_m22_fixenrolevents' of git://github.com/skodak/moodle

commit 16d1e22c102f68252a9d0f3504aca6bcc90c5736
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:54:03 +0800
Tag:    v2.0.6

Merge branch 'w43_MDL-29980_m20_flowcss' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 2acd50840cd2c4655a12cd91bf4091a759147021
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:52:31 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29980_m21_flowcss' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 5f3abf0a42808ad7890b4a2dac1f5dc5eba17067
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:52:02 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29980_m22_flowcss' of git://github.com/skodak/moodle

commit 6ab6630b8738ff85d87b7ab0801627c6e4510361
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:47:16 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29164' of git://github.com/timhunt/moodle

commit bc454be746af8e7cb5b1ad066870646e648837ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:11:58 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29197' of git://github.com/lazydaisy/moodle

commit 9fc8435c2105df5279aaa81b441b297b56a75719
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:11:44 +0800
Tag:    v2.1.3

Merge branch 'MDL-29197-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 3a7d4b4b3d1267a67d57f28787104c9c59183842
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:11:04 +0800
Tag:    v2.0.6

Merge branch 'MDL-29197-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit 2b7b20dea91bd4a2ce8f7063248de751a773ac71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 10:58:28 +0800
Tag:    v2.0.6

Merge branch 'MDL-25760_M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit 685cc34c186f0c93b02a0e8a4ee27f7d4e80405b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 10:58:14 +0800
Tag:    v2.1.3

Merge branch 'MDL-25760_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit c189b664aed0ecfed2660de01707479993124b09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 10:56:55 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-25760' of git://github.com/lazydaisy/moodle

commit 5a866c36345e09ea01e4912852fd4a9bb3e28a75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 04:38:24 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29925_m22_calendar' of git://github.com/skodak/moodle

commit 5e56574d5576de23826ef8f94bce29dc78905d3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 04:38:10 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-29925_m21_calendar' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 0bc3cbc276a346fe04b5f3a1ebea9df668d9ad35
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 04:37:55 +0800
Tag:    v2.0.6

Merge branch 'w43_MDL-29925_m20_calendar' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 01c33e8a01f34db1aeba24590d590aa43347a9ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 04:37:18 +0800
Tag:    v1.9.15

Merge branch 'w43_MDL-29925_m19_calendar' of git://github.com/skodak/moodle into MOODLE_19_STABLE

commit 703912cd5ef20e053b5ed97d721351976ab2c798
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 13:02:03 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29883_m22_mp3player' of git://github.com/skodak/moodle

commit d0464f3875101c9b0bf5e379b578d7dc38029717
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:59:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29824_m22_enrolmax' of git://github.com/skodak/moodle

commit 132258428763a61671c1328272755539181a4d9e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:31:49 +0800
Tag:    v2.1.3

Merge branch 'w43_MDL-28720_m21_calendarreturn' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 0b49b6daa75325f0c7504c2b5e14bdda99afc03e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:28:57 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-28720_m22_calendarreturn' of git://github.com/skodak/moodle

commit 5e255d5ad86a980411320ca5c63c4e96e278da27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:18:13 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27919' of git://github.com/jamiepratt/moodle

commit 243e3dd130adfdb0cd89349498c494403191de68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:11:08 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29810' of git://github.com/bostelm/moodle

commit 7a6d43a3eeac3e28a62e6ddfe233727afa042fae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:10:41 +0800
Tag:    v2.1.3

Merge branch 'MDL-29810-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit f909700aff7892eae8a2bb0374f2b9b7d61be847
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:09:41 +0800
Tag:    v2.0.6

Merge branch 'MDL-29810-20' of git://github.com/bostelm/moodle into MOODLE_20_STABLE

commit 1fe368530fda98210159d11c2781d50833af5c7f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 11:53:24 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29994' of git://github.com/stronk7/moodle

commit 70f43a4789065b158860bc4a649ef74dca229514
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 10:19:31 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29993' of git://github.com/stronk7/moodle

commit 01dc193786384ca54031397e5e481441fa4442a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 09:56:06 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29992' of git://github.com/stronk7/moodle

commit a6d832f022019e9abccad0d58041bef87d5f6bf6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:51:07 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29978' of git://github.com/stronk7/moodle

commit cdf30a11a8ed7f117dd65939492a19fd4363aa18
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:06:10 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-30006-workshop-grades' of git://github.com/mudrd8mz/moodle

commit 376d035af926e6b22c5b90df4a6a4096c12bc00d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:05:53 +0800
Tag:    v2.1.3

Merge branch 'MDL-30006-workshop-grades_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 6cedec7615cfe0fdb2483bce4224a517c0579491
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:05:35 +0800
Tag:    v2.0.6

Merge branch 'MDL-30006-workshop-grades_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit f672031f54179d10ab20c35a1969df7a83c939c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:00:25 +0800
Tag:    v2.0.6

Merge branch 'm20_MDL-28559' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit c440076d2b833c1fc2a412facd84b59761d8706f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:00:08 +0800
Tag:    v2.1.3

Merge branch 'm21_MDL-28559' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 81ad059658dd525ed65f92a1e64354cdcfdaac0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:59:35 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-28559' of git://github.com/danmarsden/moodle

commit d612fa300e720e18e60718413b616fd83a1e11d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:56:18 +0800
Tag:    v2.1.3

Merge branch 'm21_MDL-29965' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 75dab90e3df85a1cafe2b7a52bccf7099b57d150
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:55:57 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-29965' of git://github.com/danmarsden/moodle

commit ad7592f32bdabfd158d16d69d072987086fdc726
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:47:21 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-30009' of git://github.com/danmarsden/moodle

commit 84ac3ff12259ca1fc7e4f02af5fe38bcf9e4925b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:44:31 +0800
Tag:    v2.1.3

Merge branch 'MDL-29898-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 385f30f7a77a886a91d7f4394115ebd13b322c1f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:44:05 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29898-master-1' of git://git.luns.net.uk/moodle

commit 7b27861217bea48b796f9f39ce1b2ea0411b1f28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 27 Oct 2011 07:57:21 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29912' of git://github.com/stronk7/moodle

commit e6369d951c9b724a61003e95a0f5c8a5001ab6a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Oct 2011 05:44:41 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29569' of git://github.com/rwijaya/moodle

commit 5c6ec457069ed8a460cad94080985d353e4c38cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Oct 2011 05:44:20 +0800
Tag:    v2.1.3

Merge branch 'MDL-29569_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit d6261cf8c6f46bb37263f57bf97bf6005e3365ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Oct 2011 05:43:59 +0800
Tag:    v2.0.6

Merge branch 'MDL-29569_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 462a064cf08143dbf62ad4327209630f8b8776de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Oct 2011 05:21:35 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29716' of git://github.com/mouneyrac/moodle

commit 1c3bd9b3ff8278c4540122d7b6f980803b62bc31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 11:47:20 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28718' of git://github.com/timhunt/moodle

commit 68bbf587456cee5b844b92c21e4f8ba615270a32
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 11:47:03 +0800
Tag:    v2.1.3

Merge branch 'MDL-28718_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit abd481c63e4f73ea53f1736a08684cbdeab52e76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 10:44:40 +0800
Tag:    v2.0.6

Merge branch 'MDL-28324_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit d040ea889319a657a5ffb9eac38ea957dfa9400c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 10:19:45 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-29231-master' of git://github.com/phalacee/moodle

commit 88507c00633d12005449dd0f846d4032713a9dd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 10:19:33 +0800
Tag:    v2.0.6

Merge branch 'wip-MDL-29231-stable20' of git://github.com/phalacee/moodle into MOODLE_20_STABLE

commit 523f4aa78747ee238bd8ac93988440200e00c9cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 10:19:12 +0800
Tag:    v2.1.3

Merge branch 'wip-MDL-29231-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit 6327bf8f2badd558faf80b20705a733bcfa0d20f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 09:28:53 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29444_m22_iframe' of git://github.com/skodak/moodle

commit 44d10ad002096029a058e8b2b632621aa66d6d02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 09:02:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle

commit 9d9d8e17ebe41979a55460380cee75e1c3ea7d9b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 08:10:43 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29902' of git://git.luns.net.uk/moodle

commit 6f59dd1a8bc2f7c191e44b66df4d085c5d02ad62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 07:25:28 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29906' of git://github.com/timhunt/moodle

commit 35e2ec4df5b488ba3575120c2425eaef106c1d1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 07:25:06 +0800
Tag:    v2.1.3

Merge branch 'MDL-29906_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 3a87f672b7ae4c949ce8c682c52a89e26502057b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:50:10 +0800
Tag:    v2.1.3

Merge branch 'w42_MDL-29862_m21_fullmeinit' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 9c99c3df4658ca682c752bd916747302283a8c66
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:49:25 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29862_m22_fullmeinit' of git://github.com/skodak/moodle

commit 2d9408446373fb6e9e7a2defb072bd9099036611
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:46:51 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29825' of git://github.com/mouneyrac/moodle

commit c486d7f2d84d0fb9029c94d3e3e9706207dbb828
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:45:58 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29459' of git://github.com/mouneyrac/moodle

commit b8b594843c14044d8efa4484300756e707f0d149
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:42:40 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29106' of git://github.com/mouneyrac/moodle

commit f856216cb1b2699c18c654ed692afc14aae4c2bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Oct 2011 09:31:34 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-28491' of git://github.com/timhunt/moodle.git with conflict resolution

commit bc23dbcf78c1ebb11b8806741b50724a8b71b088
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Oct 2011 06:39:24 +0800
Tag:    v2.1.3

Merge branch 'MDL-29501-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit 4f50a62635346d6883206a6ab057eda4c7bde321
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Oct 2011 06:38:26 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29501-master' of git://github.com/sammarshallou/moodle

commit 37e289a131e0db4e235938a614f012ec86c6e1c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Oct 2011 06:11:57 +0800
Tag:    v1.9.15

Merge branch 'MDL-29697-Fix_incorrect_error_msg' of https://github.com/ncsu-delta/moodle into MOODLE_19_STABLE

commit ff90023b006b1c55915027e92fc4d971e1a38b52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 13:52:23 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28170' of git://github.com/stronk7/moodle

commit a258bda0b5e3f376838acd3d7a236e3a4aa04619
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 13:51:58 +0800
Tag:    v2.1.3

Merge branch 'MDL-28170_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 13df91ba6d88de124c1480c03895563c62933856
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 13:51:40 +0800
Tag:    v2.0.6

Merge branch 'MDL-28170_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 0aff48f3a44ef6bab12fb1b70d575503f6532531
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 13:51:08 +0800
Tag:    v1.9.15

Merge branch 'MDL-28170_19' of git://github.com/stronk7/moodle into MOODLE_19_STABLE

commit 22ca670f88c1de351b0043e81141663eec208119
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:37:49 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26953' of git://github.com/lazydaisy/moodle

commit f1618d93436e142c53fafad749299c161bd116a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:37:16 +0800
Tag:    v2.1.3

Merge branch 'MDL-26953-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit d951bc52acc58655b4ceeb4566d32fcbbd60b52c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:36:52 +0800
Tag:    v2.0.6

Merge branch 'MDL-26953-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit 5f6de5dc6b3f558cf8db9cadd9b3384f20704688
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:31:52 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29435' of git://github.com/mouneyrac/moodle

commit d97505d2a344df0934972521464cdd123a3dd047
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:28:32 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle

commit 6adc168c96133fd373ad777173743b90123bfd5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 11:26:04 +0800
Tag:    v2.1.3

Merge branch 'MDL-28945-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit a6ec1940c841dbfad14a738ea7f7bbc3b9b15afd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 11:25:33 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28945-master' of git://github.com/sammarshallou/moodle

commit f7e8e43f2d864767927f9b3ccc8792379579302d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 10:21:45 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29781' of git://github.com/lazydaisy/moodle

commit 24e5f9df630f90371d955c1866ecb3e7f5e99eb0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 10:17:36 +0800
Tag:    v2.1.3

Merge branch 'MDL-29781-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 9bb0bf92abc0f5af15842a127af4b2e218bcffb6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 10:17:14 +0800
Tag:    v2.0.6

Merge branch 'MDL-29781-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit 14c31e18290d04d6a37fba4adde867ea636091b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 08:55:41 +0800
Tag:    v2.0.6

Merge branch 'MDL-26893-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit 297f40838a7ef2de1064881fa6776e4ddf8725d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 08:55:18 +0800
Tag:    v2.1.3

Merge branch 'MDL-26893-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit b55853ff63c71722134245627cb10469a8423781
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 08:54:03 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26893' of git://github.com/lazydaisy/moodle

commit 92fe97f922c2f03496b54f7f171ab4f1b9db1cd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 08:18:30 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-29277' of git://github.com/mouneyrac/moodle.git with improvements

commit 629aa44873c4546ecab97d257434be14a3db0e53
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 06:07:25 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-19488_master_wip' of git://github.com/grabs/moodle

commit 2f922905150122404dfdf019e055422313cef127
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Oct 2011 05:44:53 +0800
Tag:    v2.0.6

Merge branch 'MDL-29454_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 28d838ba5eef9f32edd9a7774d9bcf9ff911e6c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Oct 2011 05:27:04 +0800
Tag:    v2.1.3

Merge branch 'MDL-29447_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit d87ef085986d1d5e7e6022b256eb9b41cb99be8b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Oct 2011 05:25:33 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29447' of git://github.com/timhunt/moodle

commit 811cbdcfbf76bfb5c1467185e33ad728abe7a5c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Oct 2011 05:15:46 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29640_master' of git://github.com/kordan/moodle

commit e1b4fa3029e90af3ef75102bedd6c5a1e1be618f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 12:57:41 +0800
Tag:    v1.9.15

Merge branch 'MDL-16553-19' of git://github.com/bostelm/moodle into MOODLE_19_STABLE

commit 787fc502ad7c19386b0903491d90b0f6d2e8a4ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 12:57:18 +0800
Tag:    v2.0.6

Merge branch 'MDL-16553-20' of git://github.com/bostelm/moodle into MOODLE_20_STABLE

commit b1913094d4d0fc253e64a0a791375e762dd239e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 12:56:58 +0800
Tag:    v2.1.3

Merge branch 'MDL-16553-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE

commit 1216ab39d1377eb6ec21897f0f1bedf3a0488c22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 12:56:14 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-16553' of git://github.com/bostelm/moodle

commit 63a778838e0e503d1fbfff77e85b570d51d1c0a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 11:27:04 +0800
Tag:    v2.1.3

Merge branch 'MDL-29661' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 27625e0fca4723edc20ae73ea56b8cb2cfb22e70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 09:56:59 +0800
Tag:    v2.1.3

Merge branch 'MDL-29692' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 3070626a748245340f4942d7d84676116a76dd2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:20:38 +0800
Tag:    v2.2.0-beta

Merge branch 'w40_MDL-29686_m2_yuicaching' of git://github.com/skodak/moodle

commit d2a5725cd55ed8a312f4787151f43f4046fb1c3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:18:08 +0800
Tag:    v1.9.15

Merge branch 'MDL-23047-Add_missing_log' of https://github.com/ncsu-delta/moodle into MOODLE_19_STABLE

commit 77b93da537e86a7001c8f4d6e09172439bd936cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:09:34 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29668' of git://github.com/stronk7/moodle

commit 7fbb52d71712ae9b3cbe05e69391c18817ae210b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:09:19 +0800
Tag:    v2.1.3

Merge branch 'MDL-29668_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 9f46908ac48b03c632fdcca5b15146622bfe132b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:09:06 +0800
Tag:    v2.0.6

Merge branch 'MDL-29668_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 36a42c57d103856ea7fabd291137f540674b86f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:03:39 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29677' of git://github.com/stronk7/moodle

commit 2a0df645217ebc493636f2575cf2af49b6ce8104
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:03:09 +0800
Tag:    v2.1.3

Merge branch 'MDL-29677_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit dbd95c2aca6eac724ab6a93123ecdb21c3f48f0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:02:26 +0800
Tag:    v2.0.6

Merge branch 'MDL-29677_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 430ce6cca3cd4a6355e4f96b6ab3e6fbfe88f5a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 06:51:08 +0800
Tag:    v2.1.3

Merge branch 'mdl-29564-assignment-plagiarism' of git://github.com/sbourget/moodle into MOODLE_21_STABLE

commit f915430855c73baeb2f117dfdab9dece2196a6f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 06:24:44 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-29690' of git://github.com/danmarsden/moodle

commit 019e897604d6759dd1ce1ac0a10c23fe02123693
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 12:58:07 +0800
Tag:    v2.0.5

Merge branch 'MDL-29621_20_wip' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit 133173e21384b2f282f3d5ea3676b5e94e6a2a95
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 12:56:39 +0800
Tag:    v2.1.2

Merge branch 'MDL-29621_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit 0870a0689971395b31ce99c7208b9a72e21176b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 12:54:00 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29621_master_wip' of git://github.com/grabs/moodle

commit c03a8543f0b01c169237a2060b3208a28afe2c7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 11:21:48 +0800
Tag:    v2.0.5

Merge branch 'MDL-28725_wiki_section2_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 91a7a788aa2d94b7d716e02f22bc42039696200b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 11:21:33 +0800
Tag:    v2.1.2

Merge branch 'MDL-28725_wiki_section2_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 2bbe5979cbe56de1deff2f86fcc550527a25105f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 11:21:16 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28725_wiki_section2' of git://github.com/andyjdavis/moodle

commit 66d216c574781db4c9043c4817272559cd7b9924
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 10:52:57 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-25937-disableif' of git://github.com/rajeshtaneja/moodle

commit 77738c4562b63db42c08f211e54de26bd42600fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 12:09:35 +0800
Tag:    v2.0.5

Merge branch 'MDL-29296_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 7d9cb204beb096db3cc30dce0787375b8038e07e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 12:08:51 +0800
Tag:    v2.1.2

Merge branch 'MDL-29296_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 1bbe222d530378956a1c0701158a429250a9fdd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 12:08:21 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29296' of git://github.com/rwijaya/moodle

commit e6f5ebe25bf65b3e8b600e423b83d79181016f60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 11:43:09 +0800
Tag:    v2.1.2

Merge branch 'MDL-29605-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 324e62047425c290372a73c73fdc69c5d43a37be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 11:41:12 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29605' of git://github.com/lazydaisy/moodle

commit e93dd0d65092ad281daace30a379da2844887224
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 10:10:05 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-29539-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 6eeb293e044a9ba00c4bf2b98bd4713fe804eb42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 10:09:53 +0800
Tag:    v2.1.2

Merge branch 'wip-mdl-29539-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 006debe5e4c8b98b8640819f59609c6b0f52724b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 10:09:17 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-29539' of git://github.com/rajeshtaneja/moodle

commit d6a7cac9915458531f41cfd332b217f0d16d1210
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:38:14 +0800
Tag:    v2.0.5

Merge branch 'MDL-28566-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit 69a62c2646c1554f3a8572173238bec446e39e6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:37:54 +0800
Tag:    v2.1.2

Merge branch 'MDL-28566-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 2c66ceeaef935fdb98904ecdc1b9cc07be420b27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:37:35 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28566' of git://github.com/lazydaisy/moodle

commit ec9b8fb68d275cc5087bb90e1e774c76b083478a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:30:26 +0800
Tag:    v2.0.5

Merge branch 'MDL-29323-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE

commit add033dafe0084b577d7766d675752b7e70b2d82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:30:12 +0800
Tag:    v2.1.2

Merge branch 'MDL-29323-M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 3a2abe2e6ebb0c7ff21f44e86f47c67f8882132c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:29:49 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29323' of git://github.com/lazydaisy/moodle

commit 49ebdaf1da1299e8550fc8c2a22694842f97f294
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:24:38 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-25454-master' of git://github.com/marinaglancy/moodle

commit 90e44b5068226e457e30959737e6b8ab75788900
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:24:18 +0800
Tag:    v2.1.2

Merge branch 'wip-MDL-25454-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_21_STABLE

commit 8bd76f9e652e621411ba2d0b9403b9423cc87462
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:23:59 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-25454-MOODLE_20_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_20_STABLE

commit ed999df32ab9c60f93e8b7d9978d8e7817a99ab2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:23:16 +0800
Tag:    v1.9.14

Merge branch 'wip-MDL-25454-MOODLE_19_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_19_STABLE

commit bf49e4404ce1e2c89e42397168639fc6ccf0a2eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:04:47 +0800
Tag:    v2.1.2

Merge branch 'MDL-29558_2_1' of git://github.com/jamiepratt/moodle into MOODLE_21_STABLE

commit 9ea1b97fa424c4e5bfd307efcd8c2f9abb932955
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:01:48 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29558' of git://github.com/jamiepratt/moodle

commit ef6380f0429d24f0d314592b991a1ecf132b1ab8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 08:29:26 +0800
Tag:    v2.2.0-beta

Merge commit 'FETCH_HEAd'

commit c06645a5396b4f974b69d293df7f779344617508
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 08:23:37 +0800
Tag:    v2.0.5

Merge branch 'MDL-29567_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit ddf0d0dcd75aa3d0b7d4a10d7d2f775f1b72f830
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 08:23:24 +0800
Tag:    v2.1.2

Merge branch 'MDL-29567_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 1efd3fc8e73ac0db3a6ac35b5800d1a6dd8473d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 08:23:01 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29567' of git://github.com/stronk7/moodle

commit 85906b4ae5e16f0070fccd85254407432fabe3e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:50:10 +0800
Tag:    v2.0.5

Merge branch 'MDL-29566_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit d85d6ccd3ea5d3c3efbc9b00bf9a62c7cecfdc94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:49:54 +0800
Tag:    v2.1.2

Merge branch 'MDL-29566_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit dcde0e9389391817ec4ec5be592f83be6d10fcc9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:49:39 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29566' of git://github.com/stronk7/moodle

commit 424cb3b0efd3fed4ed78f7fc6296d0bdd6a66715
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:28:27 +0800
Tag:    v2.0.5

Merge branch 'MDL-29618_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit bd90c5891fe89b426f5e51da4d30f5538182b416
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:28:05 +0800
Tag:    v2.1.2

Merge branch 'MDL-29618_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 9209bcfbb10047422e8ec9329b431e1c121578bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:27:11 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29618' of git://github.com/stronk7/moodle

commit e06ae159ff5147498db67d5101d6739f216825b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:24:40 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29612' of git://github.com/stronk7/moodle.git with typo cleanup

commit dc39771b01fac887afa47165a9ed9a28e6a8ccea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:02:58 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29611' of git://github.com/stronk7/moodle

commit 9afd0b3e2e67b4513535d7c39fa00115dd52691e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 06:51:30 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27295' of git://git.luns.net.uk/moodle

commit a53366f7ab139da664e063c5a0be29cfa2294f14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 09:17:36 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-29519' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit d021250bf088c88ccb1e45ea88e7c2f3eabc30e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 09:09:50 +0800
Tag:    v2.1.2

Merge branch 'm21_MDL-29519' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit f08d258cd4a3a0d2b4e07c8100b7d2abeb1e58ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 09:09:18 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-29519' of git://github.com/danmarsden/moodle

commit fe245b725b23c5aa7e71486c0071fa86e4eeb98c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 06:26:37 +0800
Tag:    v2.1.2

Merge branch 'MDL-28424_21' of git://github.com/timhunt/moodle.git with changes

commit 87eca3192f78993e9bbe2ccd241ae289cca4600d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 06:24:02 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28424' of git://github.com/timhunt/moodle.git with changes

commit bacfad505d0b152da13f6019ae5fbd207ed0f7d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 06:17:59 +0800
Tag:    v2.0.5

Merge branch 'MDL-29411_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit ded9134e03b84f9d3b198610673b2d2b148e4bf6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 09:04:15 +0800
Tag:    v2.1.2

Merge branch 'MDL-29428_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 32da08a2e269118a47350fe256d263af83859373
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 09:03:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29428' of git://github.com/timhunt/moodle

commit d496829c61d6fdfac0ee5689c8ff6536c37350e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:55:27 +0800
Tag:    v2.1.2

Merge branch 'MDL-29484_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit aa856c79994d0e82aa4126c825ef082284da929d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:53:17 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29484' of git://github.com/timhunt/moodle

commit 98182d2bb6a9359a04bd51ef5a7bdb44e1b7b8d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:50:36 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29492' of git://github.com/timhunt/moodle

commit 9c43f8f7e10da024c73ac3598563888e5302779a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:48:11 +0800
Tag:    v2.1.2

Merge branch 'MDL-29493_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 663a12c32e1bb0659a8e87277c0d402878421782
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:47:41 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29493' of git://github.com/timhunt/moodle

commit 6ef900d20bead28c4685c817fcd0a632c6a4dabc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 07:55:19 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29416' of git://github.com/stronk7/moodle

commit 809dae3461f004cde6fafcc414c745163649d96c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 07:37:12 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29336-numerrors-mapping' of git://github.com/mudrd8mz/moodle

commit 585bd024793625562e78410155a93ad4d9391748
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 07:36:46 +0800
Tag:    v2.1.2

Merge branch 'MDL-29336-numerrors-mapping-21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 5ea58ff4e14a6454e9fa0cce41062e0e4d413228
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 07:36:18 +0800
Tag:    v2.0.5

Merge branch 'MDL-29336-numerrors-mapping-20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit d7749a10a62a1e31b861d3da4c1d743db851e85f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:53:10 +0800
Tag:    v2.1.2

Merge branch 'MDL-29478_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 0ebe6764e9666cbd5dd8732eef6ed1b10cd8e2ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:52:48 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29478' of git://github.com/stronk7/moodle

commit fea98bd4c37b3641a417f5dbda6b126ef25930df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:46:39 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29139' of git://github.com/nebgor/moodle

commit 3603e0856ac993521f9be8b76a13d8edab8b7ba6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:45:57 +0800
Tag:    v2.0.5

Merge branch 'MDL-29139_m20' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit 65072bfdc225152fc28d14274cb58c2748c9574b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:45:40 +0800
Tag:    v2.1.2

Merge branch 'MDL-29139_m21' of git://github.com/nebgor/moodle into MOODLE_21_STABLE

commit 91c578c06dcd8c2aea282393d8199a22ce871ea6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:39:41 +0800
Tag:    v2.0.5

Merge branch 'MDL-29190_20_wip' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit 9f05075c612b2ba5c59c106c559b5c95bcd5e4e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:39:26 +0800
Tag:    v2.1.2

Merge branch 'MDL-29190_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit 9d0fc907e8e01ec1bb3e865af1ae097b5ce70be8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:38:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29190_master_wip' of git://github.com/grabs/moodle

commit 609ad0da5bae152ee0a35fa3b2ed47574caa64ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Sep 2011 13:52:53 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26635' of git://github.com/mouneyrac/moodle

commit 436cfb8bb76527b1e5b0683d2a09d6baedac7bad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 08:14:13 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26841' of git://github.com/stronk7/moodle

commit c4b234ec544007abcd9d56a10b3924bd57deed2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 08:13:48 +0800
Tag:    v2.1.2

Merge branch 'MDL-26841_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 5e51b68a1867529f3b22cc487620f7ea044ffc3b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 08:13:29 +0800
Tag:    v2.0.5

Merge branch 'MDL-26841_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 024315981725216edee5af96c5b777cc7e5e0bb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 07:59:03 +0800
Tag:    v2.0.5

Merge branch 'MDL-29392_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 6831c9ff36b4ef578fd7f4a57702da756bb7fe60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 07:58:23 +0800
Tag:    v2.1.2

Merge branch 'MDL-29392_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 7d6e26b49b8144c92d8ecdd1328bb88a5444e0f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 07:58:04 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29392' of git://github.com/timhunt/moodle

commit 955f15a71f75f6d1c6780d7a192288f5d220f775
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 15:20:17 +0800
Tag:    v2.1.2

Merge branch 'MDL-29366_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 4cc14ab11edd7319896cba4f49a1128a33243563
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 15:19:42 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29366' of git://github.com/timhunt/moodle

commit 5585910ea75de4e613e852db9d2076bc0884b80b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 14:36:55 +0800
Tag:    v2.1.2

Merge branch 'MDL-28329_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 0910764ff3a209df2b06029a34d9c0128bba965d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 14:36:38 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28329' of git://github.com/timhunt/moodle

commit 931f89cc13e16088a760ee0eb7d9d554ded5a4b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 13:01:00 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-25937' of git://github.com/rajeshtaneja/moodle

commit 26c28d082182d9ba9b7e7000d7fadac63bb1f55d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 13:00:40 +0800
Tag:    v2.1.2

Merge branch 'wip-mdl-25937-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit f6b9535c4bd3011b3fe74a7ade2c5684f5384690
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 13:00:23 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-25937-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 668dae632aa64c92720e3b43daf5ab9f8dc82f7f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 10:26:58 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29276' of git://github.com/mouneyrac/moodle

commit cb2c93c8db2ce107a8f093c8b1626b8fceb3fcb8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 09:32:37 +0800
Tag:    v2.2.0-beta

Merge branch 'w37_MDL-29406_m22_configdelete' of git://github.com/skodak/moodle

commit 5f4d14ebbe54c7c59f5569cfcfa2f9ac098f1c2d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 09:22:07 +0800
Tag:    v1.9.14

Merge branch 'MDL-29212_19' of git://github.com/timhunt/moodle into MOODLE_19_STABLE

commit 3d2029f3d4ba657c2bb8b0771367d23285dc862a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 07:57:58 +0800
Tag:    v2.1.2

Merge branch 'MDL-29360_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 7e0b7fe7cf9ad040c6adc937f34561cab10cfaf8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 07:56:34 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29360' of git://github.com/timhunt/moodle

commit 76ecaa10749fb42c4034630d1519d7adf4118526
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 07:40:48 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28259' of git://github.com/timhunt/moodle

commit 2b834a1d06606a43b548a1f4ff3370cbd4650598
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 07:15:04 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29415' of git://github.com/stronk7/moodle

commit 6bc526319e12437202c75b1c1114e8996199de33
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Sep 2011 11:35:27 +0800
Tag:    v2.1.2

Merged branch '28595_m22_installcontinue' of git://github.com/skodak/moodle with changes

commit 4bc844f770a13b41c1e81bb3311a73d46424ef47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Sep 2011 11:34:03 +0800
Tag:    v2.2.0-beta

Merged branch '28595_m22_installcontinue' of git://github.com/skodak/moodle with changes

commit 62b214d9a6f036c620cbed4dccecc804f3419376
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Sep 2011 08:45:34 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle

commit 62920e80bace2288de29bd5d01901df1d745b56c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 16:27:41 +0800
Tag:    v2.0.5

Merged branch 'MDL-22232_easier_turn_off_notifications_20' from git://github.com/andyjdavis/moodle.git with conflict resolution

commit 32ec60d142b21967464731eb5456e192a29ce20a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 16:18:27 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-22232_easier_turn_off_notifications' from git://github.com/andyjdavis/moodle.git with conflict resolution

commit 5fbc1470b10ac2d43642c2401f9115847cfa6341
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 15:49:46 +0800
Tag:    v2.0.5

Merge branch 'MDL-29211_M20' of git://github.com/kordan/moodle into MOODLE_20_STABLE

commit 90d14d089cfd9aefa4e477a2870b6307a7f9a814
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 15:49:26 +0800
Tag:    v2.1.2

Merge branch 'MDL-29211_M21' of git://github.com/kordan/moodle into MOODLE_21_STABLE

commit 9f768d6e5fa1d3d8c0e3a4cd141616d487fb46c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 15:48:33 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29211_master' of git://github.com/kordan/moodle

commit f8adfe6cc0be02bc469918b87a142c11581b241b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 14:26:09 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-28701_m22_tempcachedir' of git://github.com/skodak/moodle

commit eb3d2faaa1fa85741b50f48540c6c21c0baba68c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 13:48:09 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29025_m22_verboseauthdb' of git://github.com/skodak/moodle

commit 52c00a59c67263176d820c0bce438185d389f98f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 13:26:44 +0800
Tag:    v2.0.5

Merge branch 'MDL-28724_m20' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit 16ff2aee7dbc4799e534277fde524835ac420676
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 13:24:49 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28724' of git://github.com/nebgor/moodle

commit 5da0e7fc03d8ef0e9be6c453dfe88a51a6d57af0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 13:08:27 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29131_m22_recentsep' of git://github.com/skodak/moodle

commit 5b4404f615d0f30929bcaf625ab76186fd696eab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 12:52:36 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29175_m22_clozearray' of git://github.com/skodak/moodle

commit 8d6540ffd17a5f6098ec80c0d7e9385103c6d972
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 12:30:44 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29257_m22_uniqid' of git://github.com/skodak/moodle

commit 4a277f4f4e26330293ce2653ccc6ed698ac77e03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 11:30:33 +0800
Tag:    v2.1.2

Merge branch 'w36_MDL-29306_m21_dbenrolroles' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit b13dbc43d763c37a7458fe71793f17e88deeb179
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 11:30:15 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29306_m22_dbenrolroles' of git://github.com/skodak/moodle

commit 786a905607c134a064966fd56db06f836d76c03d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 11:17:25 +0800
Tag:    v2.1.2

Merge branch 'w36_MDL-29292_m21_featuretypo' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 8b5bab6f91b42ab537503bafe27eeb7ddac7ef63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 11:17:08 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29292_m22_featuretypo' of git://github.com/skodak/moodle

commit 13b7a5d4e5d137bf87a1c87564c36ddfff8167be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 10:39:42 +0800
Tag:    v2.0.5

Merge branch 'MDL-27635_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 20ff7e3279a65e90e74ae7c93263b7ef94311d19
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 10:39:22 +0800
Tag:    v2.1.2

Merge branch 'MDL-27635_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 633a5edd515f6d80e61bbef0e3cb57bd8333a84b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 10:38:45 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27635' of git://github.com/rwijaya/moodle

commit f4aea09ea4b974b615f5913642b4d3ca0b7cc837
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 10:31:03 +0800
Tag:    v2.0.5

Merge branch 'w36_MDL-29312_m20_cookieless' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 2513a2b24f898d62916bef58bf4a01eb9e4b8b2a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 10:25:02 +0800
Tag:    v2.1.2

Merge branch 'w36_MDL-29312_m21_cookieless' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 342e97ee9c23e632b78223a9ee6a26463d47c200
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:42:28 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-15377-master' of git://github.com/raymanuk/moodle

commit ef9d05cd990ad4a958bbc58eb48703b898268797
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:21:01 +0800
Tag:    v2.0.5

Merge branch 'MDL-28488_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 18fc309097564585a066d9b7abea3e0a592c987c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:20:47 +0800
Tag:    v2.1.2

Merge branch 'MDL-28488_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 0eac94dfc7991ff2fa2c84d8d04d735f906fbe24
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:19:12 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28488' of git://github.com/stronk7/moodle

commit 014d3c1f8d1de8d74f541dd637c12c9cd4e82161
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:09:30 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29269' of git://github.com/stronk7/moodle

commit e824388a1c34085a63cac6ef617c403186cca8cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 15:23:07 +0800
Tag:    v2.2.0-beta

Merge branch 'w35_MDL-29233_m22_usersel' of git://github.com/skodak/moodle

commit f364f5628f7c28724b853be62a9d888c252e309c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:08:13 +0800
Tag:    v2.0.5

Merge branch 'MDL-29018_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 3cabe2de8cc8cdd7ff41f5e15cc8407834236b56
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:08:07 +0800
Tag:    v2.1.2

Merge branch 'MDL-29018_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit ae4d8567b4b74b85b25f72141e773bbbf3e79a8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:08:03 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29018' of git://github.com/rwijaya/moodle

commit 2c90eef264e84a4bc4d39fd6341022837b7adef1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:03:12 +0800
Tag:    v2.0.5

Merge branch 'MDL-28689_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 7ecabfdce4f7a05efe7851d9651d789a788b44a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:03:08 +0800
Tag:    v2.1.2

Merge branch 'MDL-28689_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 0d966d5bfe146fd6a88997d8801e2fd93119467d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:03:04 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28689' of git://github.com/rwijaya/moodle

commit 15f3ba7e78bf0ee97cdc16995f74c9f1920c5914
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 09:41:04 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29072' of git://github.com/bostelm/moodle

commit 05956888d72df83089750bc7947e0849c71908f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 09:37:33 +0800
Tag:    v2.1.2

Merge branch 'MDL-27975_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit b1e71dac7d5c279eda4863740338b8b3cb4ee2db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 09:37:13 +0800
Tag:    v2.0.5

Merge branch 'MDL-27975_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 3dc1b595ef8cc16fd505088d05fcac1b0a65eb6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 09:36:35 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27975' of git://github.com/rwijaya/moodle

commit caff2aa6403223f116fd46241625e2e0360ffca2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 07:13:17 +0800
Tag:    v2.1.2

Merge branch 's13_MDL-29170_risklevel_21' of git://github.com/dongsheng/moodle into MOODLE_21_STABLE

commit 057c2f8d06d51e1c0bde7195c88127cf7de8a48d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 07:12:10 +0800
Tag:    v2.2.0-beta

Merge branch 's13_MDL-29170_risklevel_master' of git://github.com/dongsheng/moodle

commit 239ed133f12bb6e7aad1cfdd7df1c93dc88f127a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Aug 2011 07:03:38 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28489_master' of git://github.com/stronk7/moodle

commit ce4285c8831eba02ca9538d42a75738bee09c380
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:59:26 +0800
Tag:    v2.1.2

Merge branch 'MDL-28564_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 1e31393dba01307b35c4c5ecb9a4269aa1889550
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:58:05 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28564' of git://github.com/timhunt/moodle

commit 96083d8068751732110e21851ddbdc1fc066dc8b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:05:38 +0800
Tag:    v2.0.5

Merge branch 'MDL-26819_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit a4ad64950b4d44ff0238a79104924f2def15feaf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:05:22 +0800
Tag:    v2.1.2

Merge branch 'MDL-26819_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit e57bbf55abe82347eddc36c273d9587d340c8d2d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:05:00 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26819' of git://github.com/stronk7/moodle

commit 31bb03f6e1e2286812de559cbd2571d4e86a1e26
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:55:00 +0800
Tag:    v2.0.5

Merge branch 'dev_MDL-27289_boxnet_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit 6870b5dcbb0bb40c10b2906f103298a43c8ccfa2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:54:40 +0800
Tag:    v2.1.2

Merge branch 'dev_MDL-27289_boxnet_21' of git://github.com/dongsheng/moodle into MOODLE_21_STABLE

commit c4b06ddd7549d9a273bb54dc4be1a5a247b5875b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:53:51 +0800
Tag:    v2.2.0-beta

Merge branch 'dev_MDL-27289_boxnet_master' of git://github.com/dongsheng/moodle

commit d3e5802d97f3e95d5d755294eced9903e0f84d58
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:25:16 +0800
Tag:    v2.0.5

Merge branch 'MDL-29135-mnet-login_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 78b19caf0aabc2ba2cad23d715d65858dbd3972e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:24:57 +0800
Tag:    v2.1.2

Merge branch 'MDL-29135-mnet-login_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit c873eb4a90f21cf6b8bd897724d48738539bc32a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:23:27 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29135-mnet-login' of git://github.com/mudrd8mz/moodle

commit 1924a86afaeca2ea4a60a563250c1a32e6579c03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:13:40 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict resolution

commit b094ce466b052ead4e31020f2af0e891cdd96a16
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 07:24:26 +0800
Tag:    v1.9.14

Merge branch 'MDL-13331_m19' of git://github.com/nebgor/moodle into MOODLE_19_STABLE

commit 95d0c74474e7112d7e0cf9720df1bc3de956714b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 07:11:10 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-6397_database_rss_label' of git://github.com/andyjdavis/moodle

commit 4a7fee7be0d7bc9deecb4989b68c08a2c805098d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 14:10:58 +0800
Tag:    v1.9.14

Merge branch 'MDL-20501_m19' of git://github.com/rwijaya/moodle into MOODLE_19_STABLE

commit 3e7ff59eb43d3e5280c9e3f589d8ab116cee1d7b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 14:10:41 +0800
Tag:    v2.0.5

Merge branch 'MDL-20501_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 4f4cbbad8f240fccb9ba8e8ea5859dd811e60a05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 14:10:12 +0800
Tag:    v2.1.2

Merge branch 'MDL-20501_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 92636dfb5a77be259e75a92ef8cfd8ef84b67e7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 14:04:22 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-20501' of git://github.com/rwijaya/moodle

commit 751a6d3c29a9b8276155253a831fca4c0648ef17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 13:39:32 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL_25417' of git://git.luns.net.uk/moodle

commit bf6c05f4492911181837ea5f38abfb774b5e5d13
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 13:27:48 +0800
Tag:    v1.9.14

Merge branch 'MDL-27174_MOODLE_19_STABLE' of git://github.com/nebgor/moodle into MOODLE_19_STABLE

commit 01352e33ccf22779dcc8dd9c405bc643a9052ae9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 15:05:56 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-28311' of git://github.com/danmarsden/moodle

commit e97584bcf1075485fa043d28830fc97cc6f17001
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 14:22:51 +0800
Tag:    v2.2.0-beta

Merge branch 'mdl-28517' of git://github.com/colchambers/moodle

commit 5553dcba6723d2fb6cdebefeeced9b1cc8fea5b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 14:22:41 +0800
Tag:    v2.1.2

Merge branch 'mdl-28517_2.1' of git://github.com/colchambers/moodle into MOODLE_21_STABLE

commit 806e82b7fc9d39d77ec51fc038bff25696af11a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 14:09:53 +0800
Tag:    v2.1.2

Merge branch 'MDL-28569' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 47a6e69179282a89e2176e93de13e0a4e9a97947
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 14:00:08 +0800
Tag:    v2.0.5

Merged branch 'MDL-28575_MOODLE_20_STABLE' of git://github.com/kordan/moodle.git with conflict resolution

commit 172007a066a878771c9c28ddce2c22145e5098ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:59:08 +0800
Tag:    v2.1.2

Merged branch 'MDL-28575_MOODLE_21_STABLE' of git://github.com/kordan/moodle.git with conflict resolution

commit 0d38abcf38a09e8bc28ac0b7cac700589e75aad4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:58:10 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-28575_master' of git://github.com/kordan/moodle.git with conflict resolution

commit 4ecd7134e5d4f6ee7e2d289bbc5c01397960b1ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:45:05 +0800
Tag:    v2.0.5

Merge branch 'MDL-28587_MOODLE_20_STABLE' of git://github.com/kordan/moodle into MOODLE_20_STABLE

commit 9a2e30d8bc7a770b0da62b1af9082a98385fddc4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:44:52 +0800
Tag:    v2.1.2

Merge branch 'MDL-28587_MOODLE_21_STABLE' of git://github.com/kordan/moodle into MOODLE_21_STABLE

commit 9e4b5b45a497cc251a27febda31599d640eb35ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:43:42 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28587_master' of git://github.com/kordan/moodle

commit 3bbbd26ee6546c8d607d56aac03138662997887e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:19:18 +0800
Tag:    v2.0.5

Merge branch 'MDL-28406_block_duplicate_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 40b4296d074ac0a41f0bf06b4ea6f7609685c62a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:18:54 +0800
Tag:    v2.1.2

Merge branch 'MDL-28406_block_duplicate_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit a3ff929807af559c20bcacd3a686ba688b86736b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:18:14 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28406_block_duplicate' of git://github.com/andyjdavis/moodle

commit f24eca0c6b71f4039a04440ff97840367752ea41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:08:08 +0800
Tag:    v2.1.2

Merge branch 'MDL-28602_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 16c009c5bf8dd53aa8628d09e6f8de33854da6b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:06:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28602' of git://github.com/timhunt/moodle

commit 9d660d5f0edf84142eb0b7a79695465d69df25c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:04:38 +0800
Tag:    v2.1.2

Merge branch 'MDL-28593_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 067b8a555627240995029bdaf4c2be0c34bee4ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:04:19 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28593' of git://github.com/timhunt/moodle

commit cf7daeae7ea5fee712a0f082dd75c01d66b946cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:02:11 +0800
Tag:    v2.1.2

Merge branch 'MDL-28612_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 9d85b62c42d16a27b4500e054fbcf934080da811
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:00:38 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28612' of git://github.com/timhunt/moodle

commit 62bdb79c266d0e61b28b0829c4c4ab810becfc31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:57:31 +0800
Tag:    v2.1.2

Merge branch 'MDL-28618_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 2f86bcfffa03f68dccef26a07fde5de2779f92af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:57:11 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28618' of git://github.com/timhunt/moodle

commit 6f7c43c7de8f62cd53a7f3b54ad5325cd109c1be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:47:33 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-27586_m21_browser' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 81c77993e3808bba68fe24d6bfbac19a41679a6f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:47:21 +0800
Tag:    v2.0.5

Merge branch 'w31_MDL-27586_m20_browser' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit b1251c9008d422878e53174c9fcac002e1690dd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:46:41 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-27586_m22_browser' of git://github.com/skodak/moodle

commit cb09753feb3bf141003f9baaf1289ab6750ee90e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:26:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-27685_m22_pglike' of git://github.com/skodak/moodle

commit 6aec4988125e7180dd0c590c643680ae028f918d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:25:55 +0800
Tag:    v2.0.5

Merge branch 'w31_MDL-27685_m20_pglike' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit cf8cc1bab17c9cbef8245f6d96e56f4600142ef6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:25:47 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-27685_m21_pglike' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 11909e87a0a9ac1b7226f2c1edb8070666778555
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:21:05 +0800
Tag:    v2.0.5

Merge branch 'w31_MDL-28382_m20_iis' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 6b9c6cc54e983157a7d9015ef4da8a976f566bbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:20:57 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-28382_m21_iis' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 9be161c678f1c80ebcee2744fad6721c0f1e5a4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:20:15 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28382_m22_iis' of git://github.com/skodak/moodle

commit 7d85a4e2269736010afb46208836f1ad1e7e7f99
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:16:23 +0800
Tag:    v2.2.0-beta

Merged branch 'w31-MDL-28412_m22_iconv' of git://github.com/skodak/moodle.git with english string improvements

commit 48db633522c0c9d433563ef32c73c627a374d9d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:09:56 +0800
Tag:    v2.0.5

Merge branch 'w31_MDL-28450_m20_defgroup' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 31b4fdabbf322ea6b74a0020da34001307adbc61
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:09:46 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-28450_m21_defgroup' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 3b8502658f5dac34b716352a920a3d010d6948f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:09:31 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28450_m22_defgroup' of git://github.com/skodak/moodle

commit a9fbf9fb878142540ba033facaf940fb078d6df9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:06:21 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-28468_m21_cohortassign' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 406bf830cde1d3f0c2d5081c301595f436ad9e1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:06:06 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28468_m22_cohortassign' of git://github.com/skodak/moodle

commit 2e81c307d01c9187b31586284658909480d149a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:03:07 +0800
Tag:    v2.1.2

Merge branch 'w31_MDL-28473_m21_blocksupgrade' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 7d405fe7c8c8ad411a53e553adbd463f6c6636d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 09:59:42 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle

commit 639ab4d5c58f4b73c4102c56de10627be9b75ca9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 09:57:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28622_m22_userdel' of git://github.com/skodak/moodle

commit c357b5c6e0e3c203351d18124ee541a06281f7a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 09:50:33 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28630_m22_cookie' of git://github.com/skodak/moodle

commit 948ef5d07aa3c89a34a65173eaf399324149ec60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Aug 2011 15:03:30 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28520' of git://git.luns.net.uk/moodle

commit 5a5e7bb3b15c6ee93ec7262ec93d075633c7ca79
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:56:14 +0800
Tag:    v2.1.2

Merge branch 'MDL-28490_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 44506b87dc427eadb0456dd603574bd82ced0888
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:55:21 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28490' of git://github.com/timhunt/moodle

commit 58e67f7f1a36d5a0bc6292f19b1f23ae71efaec3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:48:02 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28508' of git://github.com/timhunt/moodle

commit 6f2723ae8388e31f26f107541af75dcdb829021c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:47:42 +0800
Tag:    v2.1.2

Merge branch 'MDL-28508_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 0f68bcbc52b3c9d68a79877987c4c187ac2c9441
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:47:13 +0800
Tag:    v2.0.5

Merge branch 'MDL-28508_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 6ea9d495b817a234d4f04cbe9cc1221be4880c3a
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:39:44 +0800
Tag:    v1.9.14

Merge branch 'MDL-28508_19' of git://github.com/timhunt/moodle into MOODLE_19_STABLE

commit 365ed23695743b3ce1d60b5f364274a41ccd69c6
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:14:33 +0800
Tag:    v2.1.2

Merge branch 'MDL-28051_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 87573744e6e26d9c9b3e95c629cd2fe27f2fa16d
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:14:04 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28051' of git://github.com/timhunt/moodle

commit 1eaeb5d89ed195e1110cd3d318a2cf3bdb6948ab
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:06:56 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28515' of git://git.luns.net.uk/moodle

commit 6b50af32d66ae1e6ca2d8f6086cb6f23a47eaf1b
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:59:55 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28340_advanced_search_other_users' of git://github.com/andyjdavis/moodle

commit 26dcfcb542c6d326055501dabef64dce4e041b7e
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:59:36 +0800
Tag:    v2.1.2

Merge branch 'MDL-28340_advanced_search_other_users_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit c440ddfb583b2c600a2b814b9950a71106235806
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:59:08 +0800
Tag:    v2.0.5

Merge branch 'MDL-28340_advanced_search_other_users_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 6a60e3f282a20c745970e4397988df2ad2546972
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:52:22 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-28504-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 34eee090a703cf574873a162b5e90590012572ac
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:51:57 +0800
Tag:    v2.1.2

Merge branch 'wip-mdl-28504-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit a338b06243e7da8f4edde537a207bc7af354e8a9
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:50:58 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-28504' of git://github.com/rajeshtaneja/moodle

commit fef0f0e79399ceae0475a0b695bfbef45e2fb301
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:46:39 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-19907-master' of git://github.com/marinaglancy/moodle

commit 9a1f42da6db9c6bbce07996d9814c3ad5aa2e054
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:46:07 +0800
Tag:    v2.1.2

Merge branch 'wip-MDL-19907-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_21_STABLE

commit f15c1b78ab16078b750381f17c9af31cc0f244b4
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:44:33 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-19907-M00DLE_20_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_20_STABLE

commit 43b2bb6cd9f0893d15f0cbde32eb495fac92f6b7
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:36:16 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-27122-MOODLE_20_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_20_STABLE

commit 3e2569f70d4ef58e1a83b88941106aadfa2f809c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:27:49 +0800
Tag:    v2.1.2

Merge branch 'wip-MDL-27122-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_21_STABLE

commit 8a5d0e95b3311f94007ba72702a5f78ef10528af
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:19:08 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27122-master' of git://github.com/marinaglancy/moodle

commit 7d5f92870e62c787f46d8dba595397586d1790e8
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 14:09:57 +0800
Tag:    v2.0.5

Merge branch 'wip-MDL-27754-MOODLE_20_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_20_STABLE

commit fa0f970835c788b43104811d1f8c6c1b4f52967e
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 14:09:30 +0800
Tag:    v2.1.2

Merge branch 'wip-MDL-27754-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_21_STABLE

commit 5867cf50475886e250cc25cf00acc03b40671afa
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 14:08:31 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27754-master' of git://github.com/marinaglancy/moodle

commit 223b96e0fd8f3f50510146a56af7477fac8879f0
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 13:42:44 +0800
Tag:    v2.2.0-beta

Merge branch 's11_MDL-28284_filepicker_module_master' of git://github.com/dongsheng/moodle

commit f89a34fb7716fe247da64b48f0b16d55b1e3c0ad
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 13:42:12 +0800
Tag:    v2.1.2

Merge branch 's11_MDL-28284_filepicker_module_21' of git://github.com/dongsheng/moodle into MOODLE_21_STABLE

commit e99d784ffe338bdb9692ae3166a4877657180f7f
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 13:41:36 +0800
Tag:    v2.0.5

Merge branch 's11_MDL-28284_filepicker_module_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit 25f8084ba0914723636280f64b7670cc7898e0fa
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 13:38:00 +0800
Tag:    v2.0.5

Merge branch 'MDL-28510_20_STABLE' of git://github.com/marxjohnson/moodle into MOODLE_20_STABLE

commit 09e7c66714851e9b35ae00bc5fb29dc83aabb75b
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 13:37:17 +0800
Tag:    v2.1.2

Merge branch 'MDL-28510_21_STABLE' of git://github.com/marxjohnson/moodle into MOODLE_21_STABLE

commit 187c395673de6b479cd908f6dc33a7de144636b1
Author: unknown <SamandJen1@.(none)>
Date:   Tue, 02 Aug 2011 13:27:00 +0800
Tag:    v2.0.5

Merge branch 'm20_MDL-27876' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit c4eea3e21ab05a246e4e5b90466f7d138f9912ea
Author: unknown <SamandJen1@.(none)>
Date:   Tue, 02 Aug 2011 13:26:25 +0800
Tag:    v2.1.2

Merge branch 'm21_MDL-27876' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 16321a2bef3827187425ac709799609160590d73
Author: unknown <SamandJen1@.(none)>
Date:   Tue, 02 Aug 2011 13:25:44 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-27876' of git://github.com/danmarsden/moodle

commit b587abd989ba4209233abdec7d7e97e56bcd1173
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 12:23:14 +0800
Tag:    v2.1.2

Merge branch 'MDL-28487-typo_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit d5addee28fea58601389435e81e85ebc4eddc865
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 12:22:57 +0800
Tag:    v2.0.5

Merge branch 'MDL-28487-typo_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit dee43df740e057a419382fd477882f1943173270
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 12:22:29 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28487-typo' of git://github.com/mudrd8mz/moodle

commit 2f783d93d5ca0bbed5d9bda012a90f1674917d1b
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 12:02:52 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-28493' of git://github.com/danmarsden/moodle

commit a8562f6c0163bc9876beb9c5bc6d6d5c10ef9eb0
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 11:49:21 +0800
Tag:    v2.0.5

Merged branch 'm20_MDL-28548' of git://github.com/danmarsden/moodle.git with comment changes

commit 9cacdc07d76a8b944202985f0e538adb936ee502
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 11:46:11 +0800
Tag:    v2.1.2

Merged branch 'm21_MDL-28548' of git://github.com/danmarsden/moodle.git with comment changes

commit 2d58b91a9c6e8cdb24e7fef40c39f0516aa347aa
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 11:06:57 +0800
Tag:    v1.9.14

Merge branch 'MDL-28209_MOODLE_19_STABLE' of github.com:nebgor/moodle into MOODLE_19_STABLE

commit e832dfec60694d86ad369d51c3c452876bf8d814
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 29 Jul 2011 10:13:57 +0800
Tag:    v2.2.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit c7f69afe4a0d6be3d50bcbbc2faff3ac79f988ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 29 Jul 2011 10:13:43 +0800
Tag:    v2.1.1

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 03e29fff56afe783ced154d196a70043a119ab29
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 29 Jul 2011 10:13:30 +0800
Tag:    v2.0.4

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 9e4d53c7e8d6d2fc70e882ac9b07f9a83d1b096e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 15:37:05 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28441_m22_scromreport' of git://github.com/skodak/moodle

commit 213eaa94f6fac90816d988769de7846c94217236
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 15:14:39 +0800
Tag:    v2.0.4

Merge branch 'MDL-28107_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 93c5c0542360b29d1f4cf9e245ea683ef48ad6fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 15:14:27 +0800
Tag:    v2.1.1

Merge branch 'MDL-28107_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 39c621f63b5b7ff4a4a243c34a7828b310005cda
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 15:14:12 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28107' of git://github.com/rwijaya/moodle

commit 30bfe7398104998b3acaaf53ff088cf9e0d48436
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 13:04:19 +0800
Tag:    v2.1.1

Merge branch 'MDL-28228' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit b835eebad913f98b4bb3a384a40e0c39db0da721
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 12:57:01 +0800
Tag:    v2.1.1

Merge branch 'MDL-28232' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 2e3a96e192efa81f4e07965573210a91b6cf8060
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:18:45 +0800
Tag:    v2.0.4

Merge branch 'w29_MDL-22584_m20_monsterpaths' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 38a6a195a4944a36b079e4f4c8a758dba9c801ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:18:37 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-22584_m21_monsterpaths' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 6c193bff68901b05cdfea5a426bbc02824f1aa24
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:18:21 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-22584_m22_monsterpaths' of git://github.com/skodak/moodle

commit 00d8d33cdc68e157fb36883634bec3116cb86c41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:08:26 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-25699_m22_installcss' of git://github.com/skodak/moodle

commit e41831dde45dc38eabc96535c0bc528e98f4ee71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:04:13 +0800
Tag:    v1.9.13

Merge branch 'w29_MDL-27464_m19_continue' of git://github.com/skodak/moodle into MOODLE_19_STABLE

commit 417fdfab6bbdcfc3f5b64704ec06912ae9cd1050
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:04:02 +0800
Tag:    v2.0.4

Merge branch 'w29_MDL-27464_m20_continue' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 18c2fcf8f19e00f0e89421d8fd8b7486a6dc6f79
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:03:52 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27464_m21_continue' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 9192b4537c7994d81b018f507a2709a13f68da2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:03:34 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27464_m22_continue' of git://github.com/skodak/moodle

commit 77c9ae457d432cb46256e1bde776ce31f171259c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:59:30 +0800
Tag:    v2.0.4

Merge branch 'w29_MDL-27653_m20_usercasting' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit dbb6d73c8c3eee9599ecf96ecd996ceadbfd5f10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:59:21 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27653_m21_usercasting' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 7fe0effd0036ac7277c58984d454075bc5be4228
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:59:08 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27653_m22_usercasting' of git://github.com/skodak/moodle

commit a8fd6146e7e4efa229bc7b344da14d215501f504
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:55:12 +0800
Tag:    v2.0.4

Merge branch 'w29_MDL-27796_m20_httphost' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit ae5375722ed95538269d1620add0cb23d98f3122
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:55:04 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27796_m21_httphost' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit b039eeb82bf507ada9c4718fed9931cebd095fa1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:54:25 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27796_m22_httphost' of git://github.com/skodak/moodle

commit 538e680d39a6c03467f0be701757ea53b8007869
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:45:51 +0800
Tag:    v2.0.4

Merge branch 'w29_MDL-27994_m20_creatorcaps' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 274d9cf9501686159e270c932f9898a3612a97b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:45:42 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-27994_m21_creatorcaps' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 0e7f782eb4242d68a94691616a187c06c24dd792
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:45:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27994_m22_creatorcaps' of git://github.com/skodak/moodle

commit ec5f521a59b6e103fa831fb95e1bc8c12f2dae04
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:40:00 +0800
Tag:    v2.0.4

Merge branch 'w29_MDL-28145_m20_renderer' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 7b205e100b1210a254ea0efd6da18907a0117f50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:39:47 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28145_m21_renderer' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 1092bd6db43b21f321541fbaa9c2ec8f6bf0e1c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:39:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28145_m22_renderer' of git://github.com/skodak/moodle

commit 100308ce24e441fb7a1f2d4408d465529613a2d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:37:05 +0800
Tag:    v2.0.4

Merge branch 'w29_MDL-28182_m20_userdel' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 39a84a780b19bd7675d82f18492c7dcad8e290e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:36:55 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28182_m21_userdel' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit e826ef51b2dd94e9fcf456c8dd70dfaaf04e1dc2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:36:36 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28182_m22_userdel' of git://github.com/skodak/moodle

commit c782b4bb58bc009fa8aa44d28e721894090653aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:30:00 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28337_m21_urlparams' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 7443fae6a5bc73dd3f6c870a475cddf326f4a8c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:29:42 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28337_m22_urlparams' of git://github.com/skodak/moodle

commit fb50bf6c32274472a2fd5b7c98fc9fbd3ba2709f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:25:08 +0800
Tag:    v1.9.13

Merge branch 'w29_MDL-28360_m19_flatfile' of git://github.com/skodak/moodle into MOODLE_19_STABLE

commit f6fc3616de8cedddfa6e9ddccf2344c0037b778c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:15:05 +0800
Tag:    v2.0.4

Merge branch 'w29_MDL-28384_m20_nullurl' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit b1591c656823ad7d49e1f88eb3d8e2223b32abfa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:14:47 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28384_m21_nullurl' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 1f70ee662ef5bd02763f6d548d82a48dfea167ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:14:29 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28384_m22_nullurl' of git://github.com/skodak/moodle

commit 94ffa4a183c61ddebcc40661256334c350682eac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:02:16 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28392_m22_capnames' of git://github.com/skodak/moodle

commit 9a8343cdde5388fe39527f613585398d55c96fa9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:53:02 +0800
Tag:    v2.0.4

Merge branch 'w29_MDL-28432_m20_cohortconfig' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 6e488526330765432fad60f2507c64e3b58501e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:52:49 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28432_m21_cohortconfig' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 8306a3799ef4a05aa709bca8aa829b2f3ca8d82d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:52:33 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28432_m22_cohortconfig' of git://github.com/skodak/moodle

commit a4e3607a212ca3ee9bd0d87e7fbbff9437329075
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:45:53 +0800
Tag:    v2.0.4

Merge branch 'w29_MDL-28440_m20_jssemicol' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 88b014092d4c318f940aafc674c787a9cd6e5362
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:45:42 +0800
Tag:    v2.1.1

Merge branch 'w29_MDL-28440_m21_jssemicol' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 08ad288d6f9081e8e28e5ce321cf3cfe7e931b5d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:44:25 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28440_m22_jssemicol' of git://github.com/skodak/moodle

commit 310758d65534dc168dec1a427ec29f05d11d68ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:39:31 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27768' of git://github.com/lazydaisy/moodle

commit a6c44179e52ab474ef829c17b3e1e8cd72e8e2d2
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:48:11 +0800
Tag:    v2.0.4

Merge branch 'w28_MDL-28363_m20_dimmed' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 5dd5e3161649598cc49b8c6a44dbe4345e6e2263
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:45:35 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28363_m21_dimmed' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 610cc5c3838433d504b969e27be5811b59780ece
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:45:13 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28363_m22_dimmed' of git://github.com/skodak/moodle

commit ab93b029191f038a17946cb2bc93d6c0fd3a529d
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:40:22 +0800
Tag:    v2.0.4

Merge branch 'MDL-28298-workshop-constant_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit bd202c15315c5c2706da62da7f02fae3ece22a66
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:39:36 +0800
Tag:    v2.1.1

Merge branch 'MDL-28298-workshop-constant_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 761a000f7353aaf9d8f4c60d9943e85549ffc212
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:39:02 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28298-workshop-constant' of git://github.com/mudrd8mz/moodle

commit 07ea543a1c60a2a6caa223890d66b65ad1335103
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:35:16 +0800
Tag:    v2.0.4

Merge branch 'MDL-28325-enrol-help_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 9190787dff1334c281cf226d8a9b3015b2ac3fdb
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:34:58 +0800
Tag:    v2.1.1

Merge branch 'MDL-28325-enrol-help_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 508a5bd402a528f8f9375631a92823c8559454d6
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:34:37 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28325-enrol-help' of git://github.com/mudrd8mz/moodle

commit 0a02548c232633e7c8c56e09ab21c9c0cb88e801
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:27:04 +0800
Tag:    v2.1.1

Merge branch 'm21_MDL-26482' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 5f65d37cd276982a25ac8090b2602a69a48d155c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:25:13 +0800
Tag:    v2.2.0-beta

Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git

commit ef5a198d1c5ad2078a6f0e244777f9db0b78a367
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 20:20:13 +0800
Tag:    v2.0.4

Merge branch 'wip-MDL-27756-MOODLE_20_STABLE' of github.com:marinaglancy/moodle into MOODLE_20_STABLE

commit a699cbcdbc246f88c0a517856e3f7c8ed3bdbd8b
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 20:18:52 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-27756-MOODLE_21_STABLE' of github.com:marinaglancy/moodle into MOODLE_21_STABLE

commit c1d251e890b048025347ece0137ac3be16db19d4
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 20:15:55 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27756-master' of github.com:marinaglancy/moodle

commit 60e7f2b113d95c164ff0fc65b422f4e953164bdb
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:51:39 +0800
Tag:    v2.0.4

Merge branch 'MDL-27555_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 8910a2d15acbe14c9b1e97599b3aabf00f905921
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:51:11 +0800
Tag:    v2.1.1

Merge branch 'MDL-27555_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit a4c3145984912f7d57dff6328d7558a1b6aca1a0
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:50:50 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27555' of git://github.com/rwijaya/moodle

commit 0704038e41b3e8f47f52e30f6053d9fc381b63bc
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:16:43 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28345_m22_utf8' of git://github.com/skodak/moodle

commit 0d9cdacf89325852b578f665b0832cd0f278dbcb
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:08:41 +0800
Tag:    v2.1.1

Merge branch 'wip-mdl-27837-MOODLE_21_STABLE' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit cc4db9d3c1a264f20f015280e5059bc338194979
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:03:22 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-27837' of git://github.com/rajeshtaneja/moodle

commit 982ea1690939d14f8c10f50522b090b70f13dd2f
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:26:19 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-23344_m21_loginfocus2' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit c5fe313c0689f207004a22286c061c15072c60ae
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:25:43 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-23344_m22_loginfocus2' of git://github.com/skodak/moodle

commit 68bc5b7b681e2aae9ab4a4f5e9a0419fc31a7778
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:19:51 +0800
Tag:    v2.0.4

Merge branch 'w28_MDL-27804_m20_csvauth' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 39b10270a119795d0dcc544d3e53edcfc5e57319
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:19:20 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-27804_m21_csvauth' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit ce4a587308f84e885e67b668777f2bc9ef9e2dd8
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:17:51 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-27804_m22_csvauth' of git://github.com/skodak/moodle

commit 45222fc50f71d318ffb3ca339d0180b0de982ec3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:10:30 +0800
Tag:    v2.0.4

Merge branch 'w28_MDL-28253_m20_managerupgrade' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 4e579f6067d5f9733c301af917c51c3b2f9dbb0c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:10:01 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28253_m21_managerupgrade' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit b96fa1c265ea7db6b9cb86ba304e4dd7edb2bf86
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:08:36 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28253_m22_managerupgrade' of git://github.com/skodak/moodle

commit 78092d6742abb7a16a4a260e24bfb7e7fcee1ed3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:04:32 +0800
Tag:    v2.0.4

Merge branch 'w28_MDL-28313_m20_enroldb' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit f6c2b4fc1322d6547117da948baa236ea7d4d41f
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:04:01 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28313_m21_enroldb' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 50a3053e62554be70f165301b7d43b7cfdf505ba
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:01:08 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28313_m22_enroldb' of git://github.com/skodak/moodle

commit 47fa86b30684db1d4efadf8e56298b9ead02ee5e
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:47:59 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28344_m22_clickjacking' of git://github.com/skodak/moodle

commit a3fe5348ab2c07316091d8c64c0e33afccdd55d3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:39:56 +0800
Tag:    v2.0.4

Merge branch 'w28_MDL-28348_m20_meta' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 056c04c9b419ce60e00ba5b7adeaa6dc5601dcba
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:39:28 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28348_m21_meta' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 5576c64139ad7756bb5cccd72f00b7ae1111c229
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:37:49 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28348_m22_meta' of git://github.com/skodak/moodle

commit 61b865f72cc481fa5567bc2c7d12c8b18b3089f0
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:29:08 +0800
Tag:    v1.9.13

Merge branch 'MDL-27889_MOODLE_19_STABLE' of git://github.com/nebgor/moodle into MOODLE_19_STABLE

commit e3f6f3089673ba492ec3ea918a0213564825aed4
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:29:01 +0800
Tag:    v2.0.4

Merge branch 'w28_MDL-28350_m20_wsra' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 03368c0b2ee4244b2e6db046d766f38a4670064c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:28:27 +0800
Tag:    v2.1.1

Merge branch 'w28_MDL-28350_m21_wsra' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 1eff23084ed3e369f43f4e79c708442187d98f27
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:27:57 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28350_m22_wsra' of git://github.com/skodak/moodle

commit b22eb6a987361a5ad73ac2b670d0cdfb77ec3288
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jul 2011 20:09:42 +0800
Tag:    v2.0.4

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 3a9e75e4645cdf0d00294e8a33142ee2cc133ce6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jul 2011 20:08:56 +0800
Tag:    v2.1.1

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 59c8535226d3f2bd62c4577a14ed92cb210de1a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jul 2011 20:06:16 +0800
Tag:    v2.2.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 9c52c8a4b0a5a0e5a9980688ee9e896f5698e673
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:20:03 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-25954_m22_cohortnav' of git://github.com/skodak/moodle

commit e2d1b25a5a65c690a2e619fd08c192fcd0ccd8db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:11:50 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-26965_m22_cohortuploaduser' of git://github.com/skodak/moodle

commit 1541d1a36bd556e45fe5ad31a9b14cef79361744
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:02:18 +0800
Tag:    v2.1.1

Merge branch 'wip-mdl-27954-MOODLE_21_STABLE' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 77de688b8231e2628543c29cdab45f9e183d2f3c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:02:00 +0800
Tag:    v2.0.4

Merge branch 'wip-mdl-27954-MOODLE_20_STABLE' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 59772e47497192e6bf4895cdab391fb29d08a658
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:01:26 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-27954' of git://github.com/rajeshtaneja/moodle

commit 9dae5179cb40dbf4458e3fe317f0bb5c6e8a1fef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 15:40:12 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-22404_m22_cohortbulk' of git://github.com/skodak/moodle

commit c430467ca836333775d5568a9b01cec75f5bb473
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 15:02:03 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28195' of git://github.com/timhunt/moodle

commit dd8e61891791602deaab6795071fab08cf9baa6f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 14:54:48 +0800
Tag:    v2.0.4

Merge branch 'MDL-28227_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 48ae99cbaf2c0b1f1b166892da23468c3793fc47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 14:50:56 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-28273_m22_cohortremove' of git://github.com/skodak/moodle

commit 3bbc7a0fc518e7874a6a40ca9d71b884c0bf4532
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 14:18:54 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-28278_m22_cohorticons' of git://github.com/skodak/moodle

commit a8361fc2146c1ebe81fb714439afc8983ee5ce0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:56:39 +0800
Tag:    v2.1.1

Merge branch 'wip-MDL-27429-m21' of git://github.com/Beedell/moodle into MOODLE_21_STABLE

commit 42afcc172a426034914a84530dca1b1f64c227ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:54:49 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27429-master' of git://github.com/Beedell/moodle

commit b2d016f3da2289cacd4cf5a4c87a444cf37c2eda
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:38:58 +0800
Tag:    v1.9.13

Merge branch 'wip-MDL-28197-MOODLE_19_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_19_STABLE

commit c9d0d331743ca36c2c4c0f21f27a1a71c831e9b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:25:44 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28268' of git://github.com/timhunt/moodle

commit ed21851b3c895473471d631b80ffd0d1cc4df950
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:17:52 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28192' of git://github.com/timhunt/moodle

commit 05deeaacdb5b52e0ae0c2743bf5c0743e51fe25a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:32:04 +0800
Tag:    v2.0.4

Merge branch 'm20_MDL-27947' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 903c12c74b7e0d638c07558598f1136b3a86cfa6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:31:48 +0800
Tag:    v2.1.1

Merge branch 'm21_MDL-27947' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 7a5c6b98e143ee682e1499c543eed3bf4e208d68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:31:13 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-27947' of git://github.com/danmarsden/moodle

commit 73d78d8de4ca3d3f18e284cdcaba83ac89e5c6dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:25:56 +0800
Tag:    v2.1.1

Merge branch 'MDL-27890_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 08d29fb18dd1e9a7d25b31fef934926bade55d98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:25:21 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27890_master' of git://github.com/stronk7/moodle

commit bbdd6f2dc1067dea7a6fa2ada4f0f715a5d9996e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:15:17 +0800
Tag:    v2.1.1

Merge branch 'glossary_multilang_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit f7776c0fc865683da4cf76a22aedc47691f55118
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:14:44 +0800
Tag:    v2.2.0-beta

Merge branch 'glossary_multilang_master' of git://github.com/stronk7/moodle

commit 19dd6873771054df938f9e640a99f0672f1aeef9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:04:35 +0800
Tag:    v2.0.4

Merge branch 'mod_url_decode_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit f738eb06e7f5407b34a5ccd4a12c8d64595ee6b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:04:18 +0800
Tag:    v2.1.1

Merge branch 'mod_url_decode_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit c75d584dccd4cfd6c4e40b1a5a8e32c2e08b1d52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:02:41 +0800
Tag:    v2.2.0-beta

Merge branch 'mod_url_decode_master' of git://github.com/stronk7/moodle

commit f2c12522c3676889b6c6c780f90b8bd588fe59e3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 10:57:33 +0800
Tag:    v2.0.4

Merge branch 'backup_groups_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 6f30a86bc7d9951a1223eb1849d343cba5d37823
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 10:57:15 +0800
Tag:    v2.1.1

Merge branch 'backup_groups_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 8b6c283f948b0c3d7f0debff6a021cc1c0ccaa8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 10:53:38 +0800
Tag:    v2.2.0-beta

Merge branch 'backup_groups_master' of git://github.com/stronk7/moodle

commit 8f49f9ce8e655b221626031520e824ae458754bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 13:24:47 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27934' of git://git.luns.net.uk/moodle

commit 50c1cb0394dba63d33daee22fd0957bb06d03489
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 13:17:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27855' of git://git.luns.net.uk/moodle

commit 668a9eb90b18f09da15af45797fe32ec0d5e2b2b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 12:11:14 +0800
Tag:    v2.0.4

Merge branch 'MDL-27716_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit c74a93d0175ac91854cb61ba1fe9d81d9e07989f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 12:10:17 +0800
Tag:    v1.9.13

Merge branch 'MDL-27716_19' of git://github.com/timhunt/moodle into MOODLE_19_STABLE

commit 024ad4bd826e93ef212d959d1d3b635aa66e1f83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 12:03:33 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27168' of git://git.luns.net.uk/moodle

commit 1a3c5d23662dad8d714b248787fe451ec4d4c9c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 11:19:27 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle

commit 8323432992de4e0c20f32b86b1412deec07adaaa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 11:06:20 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle

commit ed26ad33caaedfd4cbbb2312ae13261a7293857f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 11:05:11 +0800
Tag:    v2.0.4

Merge branch 'MDL-28135_MOODLE_20_STABLE' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit baa97ed6232921413de55ab026f0ce76fd2b7403
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 11:02:55 +0800
Tag:    v2.1.1

Merge branch 'MDL-28135_MOODLE_21_STABLE' of git://github.com/nebgor/moodle into MOODLE_21_STABLE

commit 5b966cbb3ba1fbdeeeab00d2c0fb2204bd55c7aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 10:53:48 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28135' of git://github.com/nebgor/moodle

commit ee992c6c666eedb7783f800a8a0c672e1c205e1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Jul 2011 16:51:49 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-25357_wip' of git://github.com/timhunt/moodle

commit 90e9d09b5f2153bde3ebcbf8fc0ab25559d9f5da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 01 Jul 2011 17:01:57 +0800
Tag:    v2.1.0

Merge branch 'MDL-28138' of git://github.com/timhunt/moodle

commit 39025fe1775c5aa2c5ad217e41560d9f32506eef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 01 Jul 2011 15:08:59 +0800
Tag:    v2.0.4

Merge branch 's11_MDL-28121_split_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE

commit 4c9e9e09eafdd5fe2902aae43ebf6c61410d1424
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 01 Jul 2011 15:07:21 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-28121_split_master' of github.com:dongsheng/moodle

commit 4a7e2298a3e0edca4a8e28e916261f0ba2805717
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 30 Jun 2011 10:50:10 +0800
Tag:    v2.0.4

Merge branch 'MDL-24684_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 54ae8ed032408b1c1087000017a4f58c13b1049c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 30 Jun 2011 10:49:29 +0800
Tag:    v2.1.0

Merge branch 'MDL-24684_master' of git://github.com/stronk7/moodle

commit f86e19b1ee523a7627f18ee23a232feb3daa865d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 29 Jun 2011 17:04:13 +0800
Tag:    v2.1.0

Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle

commit abfe9dbe6e3027e31c9ab0e3025c518f67f0977d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 17:05:41 +0800
Tag:    v2.0.4

Merge branch 'MDL-28023_assignment_jabber_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 5163ac94b06bbdfb8518ea2529f12b6c50b4c53f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 17:04:55 +0800
Tag:    v2.1.0

Merge branch 'MDL-28023_assignment_jabber' of git://github.com/andyjdavis/moodle

commit 8c75bb59760322872f970c006227f5abfd0f460a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 10:17:48 +0800
Tag:    v2.0.4

Merge branch 's11_MDL-27866_pix_url_20' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit e2542e1faff9bd2708d6864c05942a9e923be081
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 10:16:57 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27866_pix_url_master' of git://github.com/dongsheng/moodle

commit e78632643cac442014ffbb3a65aded1f659d508b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 10:13:15 +0800
Tag:    v2.0.4

Merge branch 'MDL-28014_stable' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit 256383c07d1a87f983474d650023d74cfae6bc83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jun 2011 10:12:39 +0800
Tag:    v2.1.0

Merge branch 'MDL-28014_head' of git://github.com/grabs/moodle

commit 29e2d0a820f2f4cf3286843177d79544ca45eb1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jun 2011 16:03:48 +0800
Tag:    v2.1.0

Merge branch 'MDL-26199' of git://github.com/timhunt/moodle

commit 35d4d85dc48ea0cf479e8bf1f5a6d744554712ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jun 2011 15:45:41 +0800
Tag:    v2.1.0

Merge branch 'unsigned_fixes' of git://github.com/stronk7/moodle

commit a3f8860d6ca8adcfaebdee0e39b401904987735d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jun 2011 15:30:11 +0800
Tag:    v2.1.0

Merge branch 'quizreport_langstrings' of git://github.com/stronk7/moodle

commit da17baf76a72fb86fd6d2e4ab4a7a155f3d0ba73
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jun 2011 15:28:49 +0800
Tag:    v2.1.0

Merge branch 'backup_bump' of git://github.com/stronk7/moodle

commit d9c19266c80a1e436810ed935bf93655c367590b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 23 Jun 2011 10:44:32 +0800
Tag:    v2.0.4

Merge branch 'MDL-27169_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 58c724a613fc9ee09b8848cec3ba310c203f4513
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 23 Jun 2011 10:43:57 +0800
Tag:    v2.1.0

Merge branch 'MDL-27169_master' of git://github.com/stronk7/moodle

commit a0977339b015bd6120bc12321f03064b84ab48a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Jun 2011 17:20:49 +0800
Tag:    v2.1.0

Merge branch 'MDL-27952' of git://github.com/stronk7/moodle

commit 8445c4724c4e2ec7b5a7e23ed66230f6f6602d55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Jun 2011 17:16:00 +0800
Tag:    v2.0.4

Merge branch 'MDL-27966_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 115910dccd4a85c50ca827786762f344effc167b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Jun 2011 17:15:10 +0800
Tag:    v2.1.0

Merge branch 'MDL-27966_master' of git://github.com/stronk7/moodle

commit 3e6c1d4d55b34bf437ef836f4c6adc4a91588098
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Jun 2011 17:10:53 +0800
Tag:    v2.0.4

Merge branch 'MDL-25811_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit df839f28dcb1065ff529c1383837493c978fa4d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 22 Jun 2011 17:06:12 +0800
Tag:    v2.1.0

Merge branch 'MDL-25811_master' of git://github.com/stronk7/moodle

commit 8a322fc19b21d63c4acd8f4fc7b601a0ba6aee17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 15:51:59 +0800
Tag:    v2.1.0

Merge branch 'MDL-24255' of git://github.com/timhunt/moodle

commit fe70d8814b5e937e6c02e00cdae44a1db4197436
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 14:31:23 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27880_get_course_participants_ws' of git://github.com/dongsheng/moodle

commit 8e307054d322a3a70ff6f84abbd6cebc1bd6538f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 14:10:41 +0800
Tag:    v2.1.0

Merge branch 'MDL-27907' of git://github.com/timhunt/moodle

commit 70e35c4d1dfdfc7d447e7674801e07b3dca8aef3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 13:45:12 +0800
Tag:    v2.1.0

Merge branch 'MDL-27916' of git://github.com/timhunt/moodle

commit 1533a25e51f9d43dcb1f5d20a77a88d99cd6301c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 13:15:37 +0800
Tag:    v2.1.0

Merge branch 'MDL-27927' of git://github.com/timhunt/moodle

commit 8ffaf7b4ddf168e521ddac4dfff30a2ecd76f8fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 13:06:10 +0800
Tag:    v2.1.0

Merge branch 'MDL-27928' of git://github.com/timhunt/moodle

commit 3fc7c06b995d723642d35d819548080670d77c77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 20 Jun 2011 13:02:02 +0800
Tag:    v2.1.0

Merge branch 'quiz_feedback_for_grade' of git://github.com/stronk7/moodle

commit 0e36d0cdf50380c687334241bfd27da124d9413b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Jun 2011 09:52:39 +0800
Tag:    v2.1.0

Merge branch 'MDL-27834' of git://github.com/kordan/moodle

commit 97161e50081668b5b5b1453676fa017bcc341d08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Jun 2011 09:48:57 +0800
Tag:    v2.0.4

Merge branch 'MDL-27286_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit f74415b926c4fab1c3fffa20cf69358fc402d0f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Jun 2011 09:47:52 +0800
Tag:    v2.1.0

Merge branch 'MDL-27286_master' of git://github.com/stronk7/moodle

commit 650142bb9b665d16252417ee3f1e3decdfebb9db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Jun 2011 09:43:24 +0800
Tag:    v2.1.0

Merge branch 's11_MDL-27497_upload_master' of github.com:dongsheng/moodle

commit d8f85b6e8b4807333a84db2ce00fc41c0e667dc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 Jun 2011 09:32:44 +0800
Tag:    v2.1.0

Merged branch 's11_MDL-27552_token_master' of git@github.com:dongsheng/moodle.git with changes

commit 46d3b9be73585100a72c6ec830871721071b4097
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 16:54:52 +0800
Tag:    v2.1.0

Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes

commit 12aafa87699878c0dc413c12a89046c207f9779d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 15:49:24 +0800
Tag:    v2.1.0

Merge branch 'master_MDL-272522' of git://github.com/danmarsden/moodle

commit f44c912bd0aa0164c91246b98d7f69fc423b1e9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 15:32:44 +0800
Tag:    v2.1.0

Merge branch 'MDL-26147-workshop-ignore-deadlines' of git://github.com/mudrd8mz/moodle

commit c1d93d47e960af78f95252fccd4dd1f6babef54c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 15:09:16 +0800
Tag:    v2.0.4

Merged branch 'MDL-26960-for-20_STABLE' of git://git.luns.net.uk/moodle with changes

commit 0723dcab40294ee636ee6940ab394f4e70225813
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 15:06:19 +0800
Tag:    v2.1.0

Merged branch 'MDL-26960' of git://git.luns.net.uk/moodle with changes

commit d98e3d6b6082f08d1f8c0049835ab887a247c83b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 14:55:48 +0800
Tag:    v1.9.13

Merge branch 'm19_MDL-27404' of git://github.com/danmarsden/moodle into MOODLE_19_STABLE

commit 6160c1721c17fe43cf4f3c6902495be0ca51a35e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 14:54:06 +0800
Tag:    v2.0.4

Merge branch 'm20_MDL-27404' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit aa8ec18b52c455f5a8059c315b8a8d14f22f2d75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 14:53:37 +0800
Tag:    v2.1.0

Merge branch 'master_MDL-27404' of git://github.com/danmarsden/moodle

commit 16c2d2c1b4be1c32004c8e64fe6cf001fe82aec4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 14:11:58 +0800
Tag:    v2.1.0

Merge branch 'MDL-26774-wip' of git://github.com/mouneyrac/moodle

commit fcc871181fc331b33aa492e20d4ca7d1559432e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 14:04:28 +0800
Tag:    v2.1.0

Merge branch 'MDL-27399' of git://github.com/mouneyrac/moodle

commit 71472b0a8263d6a4d334456a65e3e41144e8f370
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:32:55 +0800
Tag:    v2.0.4

Merge branch 'MDL-16168-CAS-crash-if-no-LDAP-20' of https://github.com/iarenaza/moodle into MOODLE_20_STABLE

commit a7b7c2d3db5fe0ad3acbbff1e9157a20cedd7afb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:22:51 +0800
Tag:    v2.1.0

Merge branch 'MDL-20538' of git://github.com/timhunt/moodle

commit ba3721d4636ab9bb87f884c7fe0dff13934276ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:18:48 +0800
Tag:    v2.0.4

Merge branch 'MDL-27757-20' of git://github.com/srynot4sale/moodle into MOODLE_20_STABLE

commit 355871acd54e9360f825b8710b5876fc1c4095e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:17:59 +0800
Tag:    v2.1.0

Merge branch 'MDL-27757-HEAD' of git://github.com/srynot4sale/moodle

commit 1a1f7b0eec2dd40484dae378846d5d51a103c5ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:14:02 +0800
Tag:    v2.0.4

Merge branch 'MDL-27783-20STABLE' of git://github.com/mouneyrac/moodle into MOODLE_20_STABLE

commit 89b2cdb28af494b714d20d3ef12882bd7e64132b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 11:13:29 +0800
Tag:    v2.1.0

Merge branch 'MDL-27783' of git://github.com/mouneyrac/moodle

commit 178ac9033b9448617285d10bb1a01ef5f578fd2b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 10:54:24 +0800
Tag:    v2.1.0

Merged branch 'MDL-27781' of git://github.com/mouneyrac/moodle.git with changes

commit 85ee4e350cf69a23081a4e5692f26f21ee780c85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 10:39:32 +0800
Tag:    v2.1.0

Merge branch 'MDL-27792-plugin-subsystem' of git://github.com/mudrd8mz/moodle

commit 79121602c45da2cac7641908005a9e6b919c109e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 10:35:55 +0800
Tag:    v2.0.4

Merged branch 'MDL-27801_MOODLE_20_STABLE' of git://github.com/kordan/moodle.git with changes

commit 954adfc923a8a24a77f896d9093366cb8d8fcad9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 10:33:39 +0800
Tag:    v2.1.0

Merged branch 'MDL-27801' of git://github.com/kordan/moodle.git with changes

commit 00a33dcbaca87b31ec87363dcecfb62ec5c1397f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 17:52:59 +0800
Tag:    v2.1.0

Merged branch 'MDL-26777-wip' of git://github.com/mouneyrac/moodle.git

commit 96e0194c058b7e82064789617c755ef0209ea746
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 17:34:17 +0800
Tag:    v2.1.0

Merged branch 'MLD-27551' of git://github.com/mouneyrac/moodle.git with changes

commit 0b8dea80dcddbf6de2148846da382d8e799ee788
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 17:09:05 +0800
Tag:    v2.1.0

Merge branch 'MDL-27747' of git://github.com/timhunt/moodle

commit bca840b4bc8362b3c3063b07cf0c42cdba35a2fa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 16:32:18 +0800
Tag:    v2.0.4

Merged branch 'MDL-27695_MOODLE_20_STABLE' of git://github.com/nebgor/moodle.git with changes

commit f6bd0b9e39c6784d0676d6ab5c657ffde603b78d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 16:25:57 +0800
Tag:    v2.1.0

Merged branch 'MDL-27695' of git://github.com/nebgor/moodle.git with changes

commit 80406e9dd8ef2d0b7adac08f285ad5a42824fdd0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:52:39 +0800
Tag:    v2.0.4

Merge branch 'MDL-27737_2.0' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit f4c5e5044024dea21dbaed80e502715b5f6c2ddb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:51:10 +0800
Tag:    v2.0.4

Merged branch 'MDL-25775_stable' of git://github.com/grabs/moodle.git

commit 287d1c0c2cc85de30ace6815ce61bf77334f6652
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:49:36 +0800
Tag:    v2.1.0

Merged branch 'MDL-25775_head' of git://github.com/grabs/moodle.git

commit 1382f8a549c1847ec894e6ef0b296f4498bfb5fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:43:51 +0800
Tag:    v2.0.4

Merged branch 'MDL-27118-MOODLE_20_STABLE' of git://github.com/epsd/moodle.git

commit 131a9071d6e5f6d622413bcf4d26020ba1d58f20
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:42:33 +0800
Tag:    v2.1.0

Merged branch 'MDL-27118' of git://github.com/epsd/moodle.git

commit f279137a862f879dd78049b4950dfd0b42cd7633
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:39:29 +0800
Tag:    v2.0.4

Merge branch 'MDL-27294-MOODLE_20_STABLE' of git://github.com/epsd/moodle into MOODLE_20_STABLE

commit de133aa87fdb3657d2f37c12bedc912a90482000
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:38:35 +0800
Tag:    v2.1.0

Merge branch 'MDL-27294' of git://github.com/epsd/moodle

commit 405f69eb7bc152576418541babcf269df8196461
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:33:42 +0800
Tag:    v2.1.0

Merge branch 'MDL-27704_master' of git://github.com/MaryE/moodle.git

commit f2ba68efc1955e0ecc7d32f51e910ed2446093b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:04:57 +0800
Tag:    v2.0.4

Merged branch 'MDL-27692' of git://github.com/MaryE/moodle.git

commit d1c96f6604fce9408c9d64eb580a2d428c1268bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 13:03:11 +0800
Tag:    v2.1.0

Merged branch 'MDL-27692_master' of git://github.com/MaryE/moodle.git

commit 629ea4957bcd720b95d0e1022f67df3ec720ffa8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 11:31:14 +0800
Tag:    v2.0.4

Merge branch 'MDL-25477-MOODLE_20_STABLE' of git://github.com/epsd/moodle into MOODLE_20_STABLE

commit 38a466084d58a5bec78e999cef9b936aa13414b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 11:30:28 +0800
Tag:    v2.1.0

Merge branch 'MDL-25477' of git://github.com/epsd/moodle

commit 9186cb7e984f9fe8f23012c62efe9a0dc4a9a666
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 11:07:22 +0800
Tag:    v2.1.0

Merged branch 'ou-messaging-release' of git://git.luns.net.uk/moodle with conflict resolution for MDL-27171

commit 7bff5441c8b5f3d45edd4989cd03499a9594b983
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 10:58:42 +0800
Tag:    v2.1.0

Merged changes for MDL-25394

commit 9bf5d894defd2ce4e2a0ef273b08255d6eceef9f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 10:38:29 +0800
Tag:    v2.1.0

Merge branch 'MDL-27564-wip' of git://github.com/mouneyrac/moodle with changes for MDL-27564

commit 0373264c2048a3f24b7afbb162cf66bb25621df5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 10:11:51 +0800
Tag:    v2.1.0

Merge branch 'MLD-27565-wip' of 'git://github.com/mouneyrac/moodle.git' with changes and conflict resolution for MDL-27565

commit 78736e5d64dfd4cc3a636f05920144545a0451ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Jun 2011 10:02:59 +0800
Tag:    v2.1.0

Merged branch 'MDL-27566-wip' of git://github.com/mouneyrac/moodle.git with changes and conflict resolution for MDL-27566

commit 4c1db5b4eab0e1b25ae5bda1618729e5a009986d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:31:38 +0800
Tag:    v2.0.4

Merged branch 's9_MDL-26392_wiki_files_20' from git://github.com/dongsheng/moodle.git with fixes

commit c464a23873a05e40b89359051eef0661ea59c4e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:29:44 +0800
Tag:    v2.1.0

Merged branch 's9_MDL-26392_wiki_files_master' from git://github.com/dongsheng/moodle.git with fixes

commit 7ea0f8e5196609fe975514d7bdf9d9e979b15aaa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:25:14 +0800
Tag:    v2.0.4

Merge branch 'MDL-27734-workshop-example-weight_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit e0f18a37c933d78df87bf210adde69b6dc1e2a5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:24:17 +0800
Tag:    v2.1.0

Merge branch 'MDL-27734-workshop-example-weight' of git://github.com/mudrd8mz/moodle

commit 656bb6725b3879d3219aa340b3af7ea5677e3245
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:23:34 +0800
Tag:    v2.1.0

Merge branch 'MDL-27733-workshop-deadlines' of git://github.com/mudrd8mz/moodle

commit ece057943d1fcab25c61619c36e8861b4615a266
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:22:49 +0800
Tag:    v2.0.4

Merge branch 'MDL-27733-workshop-deadlines_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit edb8d49d3503f074ada266270a0a65b90bf1786a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:14:52 +0800
Tag:    v2.0.4

Merge branch 'MDL-27732-glossary-introformat_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit ac6668198b4b01565acae197bbccb204714b4349
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:13:52 +0800
Tag:    v2.1.0

Merge branch 'MDL-27732-glossary-introformat' of git://github.com/mudrd8mz/moodle

commit 8c23e3f5ffdaab6c596e78c4acee6d6ad8418e2d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:11:33 +0800
Tag:    v2.0.4

Merge branch 'admin_whitespace_cleanup_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit f5936345cdcc69e250963b6cafd073c5012e54d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:09:55 +0800
Tag:    v2.1.0

Merge branch 'admin_whitespace_cleanup_master' of git://github.com/stronk7/moodle

commit 6e768484278fd362bbbb730fa5509b20cbffd8e5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 Jun 2011 16:01:49 +0800
Tag:    v2.1.0

Merge branch 'todo_wiki_upgrade_master' of git://github.com/stronk7/moodle

commit 98c1207c46f799c911b8c4c4158ae23e36ee6202
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 17:22:41 +0800
Tag:    v2.0.4

Merge branch 'wip-mdl-27603-MOODLE_20_STABLE' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE

commit 52a3c2c703694295aeddb260360cbb47e0b0129d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 17:21:29 +0800
Tag:    v2.1.0

Merge branch 'wip-mdl-27603-master' of git://github.com/rajeshtaneja/moodle

commit 3466a42f31a6357a1618cb98a6af450674d8c312
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 13:07:24 +0800
Tag:    v2.0.4

Merge branch 'MDL-25512' of git://github.com/MaryE/moodle.git

commit 8dc13ee7b088c524a937b2bef62d6951337e2e7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 13:03:07 +0800
Tag:    v2.1.0

Merge branch 'MDL-25512_master' of git://github.com/MaryE/moodle.git

commit 5436561c7c25bad808c1b5690f5ffa857f4afcbc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 10:05:59 +0800
Tag:    v2.1.0

Merge branch 'MDL-27600-master' of git://github.com/sammarshallou/moodle

commit 2e8ab7269c33a3900266317e5202713dd67fb8bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 09:33:19 +0800
Tag:    v2.0.4

Merge branch 'MDL-27636_20stable' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 59023e77997544e8b38f49838e8de2cca777602e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 09:18:02 +0800
Tag:    v2.1.0

Merge branch 'MDL-27636_master' of git://github.com/stronk7/moodle

commit 72ca02b0b27a3c3a347add35d5cc5ea1a90ab47c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 09:04:34 +0800
Tag:    v2.0.4

Merge branch 'MDL-27009' of git://github.com/aolley/moodle into MOODLE_20_STABLE

commit 9efd421e0ec9c58d58aab2bc0dbf7cd7067c8707
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 08:56:15 +0800
Tag:    v2.1.0

Merge branch 'navigationlib_userreports' of git://github.com/stronk7/moodle

commit 91bad7adc13b7d2e5d5329f7e99f8466eef6ef23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 May 2011 08:54:15 +0800
Tag:    v2.1.0

Merge branch 'MDL-27627-master' of git://github.com/sammarshallou/moodle

commit 12b3d5828689be278aeed5264a0dfbe4e71e512e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 May 2011 15:32:27 +0800
Tag:    v2.1.0

Merge branch 'MDL-22833' of git://github.com/MaryE/moodle.git

commit f9ba5c522270c07c1068565efbbe8204033c6b37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 May 2011 11:34:29 +0800
Tag:    v2.0.4

Merge branch 'm20_MDL-25177_choice_windowfix' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE

commit 2c2034c9c365ac97ca906047f81589d4d7a2a410
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 May 2011 11:32:23 +0800
Tag:    v2.1.0

Merge branch 'master_MDL-25177_choice_windowfix' of git://github.com/danmarsden/moodle

commit f79dd3b57d8c5dd68bc013a1d09417ec385e2a7b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 May 2011 11:25:25 +0800
Tag:    v2.0.4

Merge branch 'MDL-27530_stable' of git://github.com/grabs/moodle into MOODLE_20_STABLE

commit 34997cf89e706c3f2f92a4241d48e344aafc028c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 May 2011 11:24:39 +0800
Tag:    v2.1.0

Merge branch 'MDL-27530_head' of git://github.com/grabs/moodle

commit c7d4a92ccf12121d4139dd8edcfba217f73dda19
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 12:32:12 +0800
Tag:    v2.0.4

Merge branch 'MDL-27161_m20' of git://github.com/rwijaya/moodle.git

commit 870b8b0402136e22ade8b3a4ff99fd7909997433
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 12:28:18 +0800
Tag:    v2.1.0

Merge branch 'MDL-27161_head' of git://github.com/rwijaya/moodle.git

commit 5bd0e7af9fb0770a84439e44a8279fa34acc720e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 12:16:26 +0800
Tag:    v2.0.4

Merge branch 'MDL-27387_rating_scale_validation' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 731d1b89ad2967d946a7896abf77ded2c60f1148
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 12:14:11 +0800
Tag:    v2.1.0

Merge branch 'MDL-27387_rating_scale_validation_master2' of git://github.com/andyjdavis/moodle

commit 794fb0e5656826797b0d009abcfa230f2a818122
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 12:10:58 +0800
Tag:    v2.0.4

Merge branch 'MDL-26075_stable' of git://github.com/grabs/moodle

commit c23ee732c210e08afd0d3f30667c53c9fa383810
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 11:51:41 +0800
Tag:    v2.1.0

Merge branch 'MDL-26075_head' of git://github.com/grabs/moodle

commit d5a99a030c7ea797b8d01c86ad2204e7b828b9a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 10:06:49 +0800
Tag:    v2.1.0

Merge branch 'start_end_notifications' of git://github.com/stronk7/moodle

commit 62ff4fe30b228f31a48973292b475ea55f329ef1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 May 2011 09:56:42 +0800
Tag:    v2.1.0

Merge branch 'prevent_profiling_before_install' of git://github.com/stronk7/moodle

commit 633fcef536806e187562618050649cc6080845d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 May 2011 09:54:15 +0800
Tag:    v2.0.4

Merge branch 'MDL-27140_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit a0fcf81265d605ef577ce93c3a42c2ba98f7f364
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 May 2011 09:45:40 +0800
Tag:    v2.1.0

Merge branch 'MDL-27140_master' of git://github.com/stronk7/moodle

commit 6867fc94b79b5cd1aee382fc408e426767cd6ec7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 May 2011 10:52:22 +0800
Tag:    v2.0.4

Merge branch 'MDL-27325_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 8f25ae26db4c21efc5935641c4681327dec0fb0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 May 2011 10:35:31 +0800
Tag:    v2.1.0

Merge branch 'MDL-27325_master' of git://github.com/stronk7/moodle

commit 8385249f5b09c75f05f15fa02c3b0c0e2435249a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 May 2011 10:22:20 +0800
Tag:    v2.0.4

Merge branch 'MDL-27367-20' of git://github.com/srynot4sale/moodle into MOODLE_20_STABLE

commit 644b14c552f94048954ecf92b696dca04f4a411a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 May 2011 10:20:15 +0800
Tag:    v2.1.0

Merge branch 'MDL-27367-HEAD' of git://github.com/srynot4sale/moodle

commit 36f0835e7271abfff017dfc8ef662e0c786aeba5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 13:26:46 +0800
Tag:    v2.0.3

Merge branch 's9_MDL-27382_dropbox_get_file_fix_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE

commit a02f87a83825a7789c00fa2039f518d3757fbc8b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 13:25:36 +0800
Tag:    v2.1.0

Merge branch 's9_MDL-27382_dropbox_get_file_fix_master' of github.com:dongsheng/moodle

commit 259b9d05f33a1c6ef39ecdf8cec7c8dfae7b911e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 13:23:22 +0800
Tag:    v2.0.3

Merge branch 's9_MDL-27381_overwrite_dialog_safari_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE

commit 74704aab26cd0b3e93d0406205651dbb6a8adbdc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 13:22:15 +0800
Tag:    v2.1.0

Merge branch 's9_MDL-27381_overwrite_dialog_safari_master' of github.com:dongsheng/moodle

commit da20cd7b43ae0ef311c1b49bef9ef95ce6a95a86
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 11:46:05 +0800
Tag:    v2.0.3

Merge branch 's9_MDL-26854_spam_comments_20_2' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit d6e0313e86cd9e0015c96f3cf58e3c1f90260fbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 11:44:49 +0800
Tag:    v2.1.0

Merge branch 's9_MDL-26854_spam_comments_master_2' of git://github.com/dongsheng/moodle

commit 7390fdde6305fc1d83a48ecce48a1607ad9972e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 10:42:58 +0800
Tag:    v2.0.3

Merge branch 's9_MDL-26854_spam_comments_20_2' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit d045b479f42710f29663184ea578f2f8f40b2711
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 10:41:53 +0800
Tag:    v2.1.0

Merge branch 's9_MDL-26854_spam_comments_master_2' of git://github.com/dongsheng/moodle

commit 1374c61bb423b86890fabd61e40f17e23ea0ce21
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 10:19:54 +0800
Tag:    v2.0.3

Merge branch 'MDL-26838_ratings_bad_data3' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit 2c82d0eeb0c79726f0f7354a90f5bae39e1589f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 10:18:39 +0800
Tag:    v2.1.0

Merge branch 'MDL-26838_ratings_bad_data_master4' of git://github.com/andyjdavis/moodle

commit 280b1b21c0dc5193b09b8d5c3388abfb27f03cd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 May 2011 18:04:10 +0800
Tag:    v2.1.0

Merge branch 'MDL-26250-final6' of github.com:mouneyrac/moodle

commit c44a5d5946b0ae35ce3687bbfff46f087474b23f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 May 2011 13:56:59 +0800
Tag:    v2.0.3

Merge branch 's10_MDL-27330_dropbox_authorization_url_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE

commit f4c7c735f51ed97145478932156c4d9c14de42c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 May 2011 13:53:47 +0800
Tag:    v2.1.0

Merge branch 's10_MDL-27330_dropbox_authorization_url_master' of github.com:dongsheng/moodle

commit 0baa1eee59d045a2d7b3e5976d3d771042ab329a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 16:28:38 +0800
Tag:    v2.0.3

Merged MDL-26388 Fixed whitespace

commit c8ad2c12bae0e895faffe5b4eee5b43dc982a10b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 16:27:31 +0800
Tag:    v2.1.0

Merged MDL-26388 Fixed whitespace

commit 6a48b42ae8f8dfc6b04fb1db8660f26424e9b195
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 15:42:26 +0800
Tag:    v2.0.3

Merge branch 'MDL-25805_MOODLE_20_STABLE' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit 870815faed6cf2aef67b99e883f91dff7c85788a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 15:41:34 +0800
Tag:    v2.1.0

Merged MDL-25805 Renamed property and function to be a little more descriptive

commit 2dd90f136cae695b6d12b60204868eca176496f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 11:00:15 +0800
Tag:    v2.0.3

Merge branch 'MDL-26628' of git://github.com/srynot4sale/moodle into MOODLE_20_STABLE

commit e6647397b9061c7bfa16400f5d99de8e2daa60c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 10:54:44 +0800
Tag:    v2.0.3

Merged MDL-27251 Fixed up whitespace, Fixed broken string, reworded new strings

commit 5f1c825dfafbb4015d9e1197bdffe75fa30a1114
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 10:51:06 +0800
Tag:    v2.1.0

Merged MDL-27251 Fixed up whitespace, Fixed broken string, reworded new strings

commit e3cc5b1a7f7d51669314bb4400b30aa9fe6d7f29
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 15:00:54 +0800
Tag:    v2.0.3

Merged changes and fixed whitespace issues for MDL-23188

commit fa49d2431282da0975ca24f834689c79074c66d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:43:24 +0800
Tag:    v2.1.0

Merged changes and fixed whitespace issues for MDL-23188

commit 0742ea86b20c6ada06f3ac1e41882bc5a126786d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:23:06 +0800
Tag:    v2.0.3

Merge branch 'MDL-26955-themedir-plugindirectory_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit c0ceb0bab3ba195fa60823f0ab0b3111f792e82e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:21:16 +0800
Tag:    v2.1.0

Merge branch 'MDL-26955-themedir-plugindirectory' of git://github.com/mudrd8mz/moodle

commit 0af90dca017d97cef20040da3bff9e53c0d0e26c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:16:13 +0800
Tag:    v2.1.0

Merge branch 'MDL-27116-themedir-config' of git://github.com/mudrd8mz/moodle

commit 41f79b5c07c81a48341a83464c2f871d64b76292
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:12:45 +0800
Tag:    v2.0.3

Merge branch 'MDL-27116-themedir-config_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit ed85c0acd249997d9b042de782c9c6ba39d86deb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:09:26 +0800
Tag:    v2.0.3

Merge branch 'MDL-27155_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 598a9f77267f68f0464e1ca937a57fde2d70f271
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:03:36 +0800
Tag:    v2.1.0

Merge branch 'MDL-27155_master' of git://github.com/timhunt/moodle

commit 9c39028179679a10c3fe47f12917bb239e323686
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 12:14:05 +0800
Tag:    v2.0.3

Merge branch 'MDL-27246-cutomlang-version_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 290a5db67ef9a2afafc0a6fcc06a4f7866a684fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 12:11:23 +0800
Tag:    v2.1.0

Merge branch 'MDL-27246-cutomlang-version' of git://github.com/mudrd8mz/moodle

commit 2715f9693283c038e95f30cf8d65b899e2a9c339
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 16:29:49 +0800
Tag:    v2.0.3

Merged with small fix branch MDL-26516_m20_calevent_wip4 from git://github.com/rwijaya/moodle.git

commit 4d8bd3f570b12831fe0e84526d81fc83b59d9fd2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 16:25:40 +0800
Tag:    v2.1.0

Merged with small fix branch MDL-26516_head from git://github.com/rwijaya/moodle.git

commit a4b65c11b9e6d240b86042e030562f398aa812e3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 10:46:54 +0800
Tag:    v2.0.3

Merged with conflict resolution branch MDL-26835_MASTER_grader_highlight_suspended_users from git://github.com/andyjdavis/moodle.git

commit 9146566c651109fe25d93df830d99d4aef1dcd8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 10:35:50 +0800
Tag:    v2.1.0

Merged with conflict resolution branch MDL-26835_MASTER_grader_highlight_suspended_users from git://github.com/andyjdavis/moodle.git

commit e6cf40de7881a96c49824cdfb68895d4ee27614b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 10:26:30 +0800
Tag:    v2.0.3

Merge branch 'MDL-25999_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit d0542700f5267e184d33aa7da762ddec3374ea1b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 10:16:39 +0800
Tag:    v2.1.0

Merge branch 'MDL-25999_head' of git://github.com/rwijaya/moodle

commit 6f8081bef474eb48aad54b7b52104b3ce4b1239b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 18 Apr 2011 10:57:27 +0800
Tag:    v2.0.3

MDL-26958 PULL-675 Merged changes and removed border colour style

commit 465846f0823dd34370cc36197fef7ac95b9bfca4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 15:38:48 +0800
Tag:    v2.0.3

Merge branch 'MDL-25746_m20' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit 2e79cd117ace45e07db86c7d3ee3493648afe791
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 15:35:03 +0800
Tag:    v2.1.0

Merge branch 'MDL-25746' of git://github.com/nebgor/moodle

commit e1ce7c7e7b4c17ce133b547e713b838b9e97c6a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 14:48:01 +0800
Tag:    v2.1.0

Merge branch 'MDL-26896' of git://github.com/stronk7/moodle

commit 67b5d74b2ce9cb3ecc15de2e8c6f488abbc980de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 14:34:57 +0800
Tag:    v2.0.3

Merge branch 'MDL-27034_xhprof_table_sql_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 08c2633f12ec363dcd9c6a910ec50cf82c218db0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 14:28:57 +0800
Tag:    v2.1.0

Merge branch 'MDL-27034_xhprof_table_sql_master' of git://github.com/stronk7/moodle

commit 7d1fb2f6eca79ebccb733aab17252eb8cb8c54f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 11:54:50 +0800
Tag:    v2.0.3

Merged branch 'MDL-26185_m20' of git://github.com/andyjdavis/moodle.git and fixed conflicts

commit cf0050f92ac8609c96af0b635830e9f9d7c7d612
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 11:48:18 +0800
Tag:    v2.1.0

Merge branch 'MDL-26185_master' of git://github.com/andyjdavis/moodle

commit d59d34e9a74091505e183c98d8628098cdeaca68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 11:42:53 +0800
Tag:    v2.1.0

Merge branch 'w15_MDL-27056_m21_maxmind' of git://github.com/skodak/moodle

commit 227e54d65ad118394abf8823c61c8dcdc289bd50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 11:38:21 +0800
Tag:    v2.0.3

Merge branch 'MDL-27063' of git://github.com/MaryE/moodle into MOODLE_20_STABLE

commit 032be8a19bf424ba993133c4beabe752d5345d74
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 11:31:38 +0800
Tag:    v1.9.12

Merge branch 'MDL-26130' of git://github.com/MaryE/moodle into MOODLE_19_STABLE

commit 637a8daf76c282464e859df4ffc39535acee83f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Apr 2011 13:30:55 +0800
Tag:    v2.1.0

Merge branch 'MDL-26185_ms' of git://github.com/rwijaya/moodle

commit 728f3c9d0843e2f2969380ba82eae158d56ec412
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Apr 2011 13:21:24 +0800
Tag:    v2.0.3

Merge branch 'MDL-26185_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit adb24226bfcd4810b163eb9f44dc007492ad6c89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Apr 2011 13:08:37 +0800
Tag:    v2.1.0

Merge branch 'MDL-27016' of git://github.com/MaryE/moodle

commit 4632bb96685a40a435125ba51bb8d7752bab7aa9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Apr 2011 11:16:33 +0800
Tag:    v2.1.0

Merge branch 'earlier_profiling' of git://github.com/stronk7/moodle

commit 223680f56281e720404345c2f3c4f379642044b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 16:12:55 +0800
Tag:    v2.1.0

Merge branch 's8_MDL-26916_filepicker_paging' of git://github.com/dongsheng/moodle

commit 628c600cd92f24d9d20d8e5ac82e2e7bd252503d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 16:10:39 +0800
Tag:    v2.1.0

Merge branch 'm20_MDL-26957_forum_overview' of git://github.com/danmarsden/moodle

commit 6db981b2ee512c4464af81acad84938c3c082313
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 16:03:15 +0800
Tag:    v2.1.0

Merge branch 'MDL-26906-2' of git://github.com/epsd/moodle

commit e1a7281ab26b3486f0e400e1304bdd2caebee570
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 15:59:25 +0800
Tag:    v2.1.0

Merge branch 'MDL-26077_message_strip_brackets2' of git://github.com/andyjdavis/moodle

commit e1339a6dda3f39f11854623d262b6ffb4e7d2ca3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 15:52:21 +0800
Tag:    v2.1.0

Merge branch 's8_MDL-26798_dropbox_repo' of git://github.com/dongsheng/moodle

commit 13c53a4a2ec225ae637bdee74a250849ec7f970e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 14:33:27 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-26992_20_uploadtemplates' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit bc071c75803522d8f76c85954be150021562fa52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 14:29:50 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26992_21_uploadtemplates' of git://github.com/skodak/moodle

commit d3796a2c61d01ee7007ccdda6a36b7fd71a50e99
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 14:17:08 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-26989_20_enrolroles' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 982e619d2a3ba153a53841d6536cbba8c8104014
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 14:10:44 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26989_21_enrolroles' of git://github.com/skodak/moodle

commit d2c4a97a70f6f3edae11a5e7e5e4d26431de35c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 13:54:39 +0800
Tag:    v2.1.0

Merge branch 'w13_MDL-26795_21_emailchange' of git://github.com/skodak/moodle

commit 8196e3c08dcd1cb6027cac122fc722e84595108f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 17:32:06 +0800
Tag:    v2.0.3

Merge branch 'MDL-26557' of git://git.luns.net.uk/moodle

commit 587a4ee42cf6ebec89619a3341e5a2370083da71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 17:23:13 +0800
Tag:    v2.0.3

Merge branch 'MDL-26827' of git://git.luns.net.uk/moodle

commit c889fb83724801568472442d5fe2a85019912cbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 17:19:06 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26904_20_PHPLOL' of git://github.com/skodak/moodle

commit beb81f4947043cc0746ef58128a7901ae204f24e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 17:13:20 +0800
Tag:    v2.0.3

Merged PULL-496/MDL-26859 and fixed incorrect defines

commit ee780aeeaf8efb310d6f22eaba8b51d0fca530e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 16:50:07 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26876_20_blogformat' of git://github.com/skodak/moodle

commit d9738e84d6695fecc7727ebae3478faf707eb9c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 15:58:19 +0800
Tag:    v2.0.3

Merged PULL-480/MDL-24877 and bumped version number to fix conflict

commit 161ba40d03b06e5da387b2ef7a4a77ef532063bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 15:47:36 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26808_20_enrolpageurl' of git://github.com/skodak/moodle

commit ca3fce634f0fe9944636aa5a5f9f92ddac8a249b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 14:27:45 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26826_20_youtubedim' of git://github.com/skodak/moodle

commit 909fc3ff2e0195303e7f371c41d647134c817993
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 14:16:51 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26726_20_typocat' of git://github.com/skodak/moodle

commit e460480080d59dc601f90efee639057faf5a6f60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 14:10:44 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26825_20_cancelform' of git://github.com/skodak/moodle

commit d1f54251711221e031dad49b25485f89485a97a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 13:37:36 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26837_20_algebra' of git://github.com/skodak/moodle

commit 1698268db1795145f485550a63dca9f86ae38878
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 13:30:59 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26834_20_inactiveparticipants' of git://github.com/skodak/moodle

commit 885e86b108b5cb8fff0148c2d7e0fcea7f36c053
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 12:36:47 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26833_20_inactiveforum' of git://github.com/skodak/moodle

commit 37fff873983974bf0227d815b136b5d35a122c7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 12:28:45 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26803_20_userupload' of git://github.com/skodak/moodle

commit b89d39bfcb7ce8b001c10e21de3b15dce7056382
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 12:22:23 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle

commit 9d61397181ed38dbee538140867ca4088041dbec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 11:54:20 +0800
Tag:    v2.0.3

Merge branch 'MDL-26607_search_error' of git://github.com/andyjdavis/moodle

commit 0235bd87067090fd32c6db81ebd8e699e0affa6f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 11:16:50 +0800
Tag:    v2.0.3

Merged MDL-25565 PULL-451 and fixed conflicts

commit f786f011153d5f43c0a2e0ab43096319d458d801
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 18:02:18 +0800
Tag:    v2.0.3

Merge rebased branch 'formal_white_2011030507' of git://github.com/kordan/moodle.git

commit e96aa1a669d163cc592b24fb29c9e4a183dfc7a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 16:05:37 +0800
Tag:    v2.0.3

Merge branch 's7_MDL-26583_filepicker_lang' of git://github.com/dongsheng/moodle

commit 4bbe460316e7e596dff847a5a2ad229f0a476f2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 15:41:51 +0800
Tag:    v2.0.3

Merge branch 'w11_MDL-26480_20_redirect' of git://github.com/skodak/moodle

commit 85f1abe30422e861b294d7314fa4b5a99d34b62b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 15:33:49 +0800
Tag:    v2.0.3

Merge branch 'MDL-13983' of git://github.com/timhunt/moodle

commit 9fed82de9c76058c93ea6086a240278c4080049d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 11:22:05 +0800
Tag:    v2.0.3

Merge branch 'MDL-26785' of git://github.com/stronk7/moodle

commit 2012d82a96df0384ed29c8fde334b6a5b3fd1afd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:59:58 +0800
Tag:    v2.0.3

Fixed merge conflicts in nonzero theme

commit 66c6e870ef541ce17f43d3363aba65eca066a2f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:54:24 +0800
Tag:    v2.0.3

Merge branch 'MDL-25304' of git://github.com/epsd/moodle

commit b146486613ad4fa32f46e9d798bed112e6098a9b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:43:42 +0800
Tag:    v2.0.3

Merge branch 'MDL-25786-2' of git://github.com/epsd/moodle

commit e9fda1c9452c4ebb4e72dd7aa6414893bf860191
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:36:17 +0800
Tag:    v2.0.3

Merge branch 'MDL-25212' of git://github.com/epsd/moodle

commit af99e7286b569836443ef9410ee565fd095b11bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:33:17 +0800
Tag:    v2.0.3

Merge branch 'MDL-25939-3' of git://github.com/epsd/moodle

commit 77a5af1f1233f95b287eac7f8222c91c4f516a0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:19:52 +0800
Tag:    v2.0.3

Merge branch 'MDL-26084' of git://github.com/epsd/moodle

commit df94dbd825a4723ca3012109fd9e5bcd818fdf9d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 09:57:55 +0800
Tag:    v2.0.3

Merge branch 'MDL-24743' of git://github.com/epsd/moodle

commit e2d50a6a007221b92bd6015522eee13174bc3ecc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 09:51:27 +0800
Tag:    v2.0.3

Merge branch 'MDL-26711' of git://github.com/epsd/moodle

commit 0032523aeda6d73c6e938ec56488a86ae81351cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 17:58:12 +0800
Tag:    v2.0.2

Merge branch 'PULL-226-workshop' of git://github.com/mudrd8mz/moodle

commit 6ae16d7fff6fe24dd67005997482bc2e11cc7971
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 16:31:38 +0800
Tag:    v2.0.2

Merge branch 'w06_MDL-26262_20_onlineblock' of git://github.com/skodak/moodle

commit 9cb70adc338cebca2e7fcd7c2a7223182c9eedc9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 16:20:02 +0800
Tag:    v2.0.2

Merge branch 'w06_MDL-26238_20_group' of git://github.com/skodak/moodle

commit 9377348eb0624f4719b672eec6cc7fa86764ae57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 16:11:50 +0800
Tag:    v2.0.2

Merge branch 'w06_MDL-26221_20_courserole' of git://github.com/skodak/moodle

commit dedda4abc3135590dda81225fa32ce408a3838e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 16:03:27 +0800
Tag:    v2.0.2

Merge branch 'MDL-26272' of git://github.com/stronk7/moodle

commit c1a974983a06310f257b66ed99ad202cb24a7f81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 15:41:26 +0800
Tag:    v2.0.2

Merge branch 'MDL-26245-typo_in_exception_string' of git://github.com/mudrd8mz/moodle

commit 82bbf32d3cd00d044098ae477ac6a479b5f24018
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 15:32:23 +0800
Tag:    v2.0.2

Merge branch 'MDL-26252-import-groups-help' of git://github.com/mudrd8mz/moodle

commit d44327efd9864497641f2597a87553f17f4961c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 15:16:40 +0800
Tag:    v2.0.2

Merge branch 'MDL-26119_message_logging' of git://github.com/andyjdavis/moodle

commit 89652edd6ce7ae5307c32eeffd453f6943e2ac38
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 15:13:53 +0800
Tag:    v2.0.2

Merge branch 'MDL-26242' of git://github.com/timhunt/moodle

commit 449adacbc3b0ebc99e62c5ad7d70168f787f02e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 14:21:24 +0800
Tag:    v2.0.2

Merge branch 'MDL-25639' of git://git.luns.net.uk/moodle

commit 1ca95a13f3ea4ea1cfcc73caf5202ff3b05b8a2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 14:01:00 +0800
Tag:    v2.0.2

Merge branch 'MDL-25874' of git://git.luns.net.uk/moodle

commit e8d6d2472978bab564831a6ca62e480432648742
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 13:50:36 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-25671_data_template_editor' of git://github.com/dongsheng/moodle

commit ed4801f4f0ee0d59dd84cd3e18636686a6b300e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Feb 2011 13:40:51 +0800
Tag:    v2.0.2

Merge branch 'MDL-25939'

commit 2b1f6ced64216b30489aa4e898583f93a39e3061
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 17:47:30 +0800
Tag:    v2.0.2

Merge branch 'MDL-26178' of git://github.com/timhunt/moodle

commit 1f5a33439eb7d0aef2e1cfe75d2512fa7a430a95
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 17:16:56 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-26176_cleanup' of github.com:danmarsden/moodle

commit dfc05681f2bcfb7b9d94ea2ebfc901716236b424
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 17:06:53 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-25781_TOC_fix' of git://github.com/danmarsden/moodle

commit d44d6448db1c98bb67d5ad4b9a5d08b61a5d8889
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 16:28:28 +0800
Tag:    v2.0.2

Merge branch 'w05_MDL-26069_20_filecheck' of git://github.com/skodak/moodle

commit cf59f747d0c08f5da763ae0d4d7d9fa3d5000384
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 14:58:08 +0800
Tag:    v2.0.2

Merge branch 'MDL-25913'

commit 0c6ab77c58c17b7f092a05ef4fa04ea16b600156
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 14:41:04 +0800
Tag:    v2.0.2

Merge branch 'MDL-25914'

commit 1c4b7783761409a7f1ace7fdd54fbe03f99e62c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 14:16:46 +0800
Tag:    v2.0.2

Merge branch 'MDL-25892' of git://github.com/epsd/moodle

commit 16ce82a4d3b7f1020abe07a0928145e61f3470a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 14:10:12 +0800
Tag:    v2.0.2

Merge branch 'MDL-25834'

commit 3721781dfed869a53d3625f4e0fbda0a2f106ef9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 13:50:21 +0800
Tag:    v2.0.2

Merge branch 'MDL-26168' of git://github.com/timhunt/moodle

commit 60177f84a82337419c1e7ce11c6069b772331dba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 13:31:40 +0800
Tag:    v2.0.2

Merge branch 'MDL-25786' of git://github.com/epsd/moodle

commit 13b9fe035c62fd772212c2aa5477b96948961662
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 13:17:26 +0800
Tag:    v2.0.2

Merge branch 'MDL-25723' of git://github.com/epsd/moodle

commit 490a1862696730acad780e830b156cdc654ce70c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 13:14:52 +0800
Tag:    v1.9.11

Merge branch 'm19_MDL-25320' of git://github.com/danmarsden/moodle into MOODLE_19_STABLE

commit 8dadee2499aa22579508dd4b821948ce552625de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 13:05:09 +0800
Tag:    v2.0.2

Merge branch 'MDL-21250-capitalized_strings' of git://github.com/mudrd8mz/moodle

commit 299a3e70813f5a520e3339ca767bd06a5ea8636f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 12:09:53 +0800
Tag:    v2.0.2

Merge branch 'MDL-26158'

commit 3e6d0ac62804931660323ea8e855f09f3ba3e43d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Jan 2011 11:52:40 +0800
Tag:    v2.0.2

Merge branch 'w05_MDL-25743_20_selfenrol' of git://github.com/skodak/moodle

commit ac36bda238c688125b2968828137d23aed495abc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jan 2011 12:18:05 +0800
Tag:    v2.0.2

PULL-157, MDL-26116 Fixed merge conflicts

commit 912d099cc94e40777b73b2412d12ffd95f79856d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 16:20:51 +0800
Tag:    v2.0.2

Merge branch 'MDL-25637'

commit c9b2e8bf61331c08b94c14d5c99e349c49c03b2d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 15:05:55 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26035_20_installtest' of git://github.com/skodak/moodle

commit c053c86c5b1ac6f6839d9fe9b93b79d273080767
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 13:26:51 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26066_20_dbenrol' of git://github.com/skodak/moodle

commit b6c7558c2d38d73238bfd9d70a0cc149c51c43d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:57:06 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26096_20_catenrol' of git://github.com/skodak/moodle

commit 0243d7eb2f0cbef8a916acdf4d390b5b91de65a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:51:38 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-25855_20_filerequire' of git://github.com/skodak/moodle

commit 2e725dd72be130d494e539729c5c5c66c8cfb518
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:38:29 +0800
Tag:    v2.0.2

Merge branch 'MDL-26061-no_remote_users' of git://github.com/mudrd8mz/moodle.git with changes

commit c7a8c3623371e91d37a6cd955927d7dda31ed523
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:10:40 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26008_20_creator' of git://github.com/skodak/moodle

commit 12cd15aeaa608bb00829c8d47c7822181ec1e670
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:07:29 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26106_20_lebletypo' of git://github.com/skodak/moodle

commit 4fd25ab95cfbf68c6d6586a13e3f18ce4222780c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:02:07 +0800
Tag:    v2.0.2

Merge branch 'm20_MDL-26063_SCORM_grouping' of git://github.com/danmarsden/moodle

commit 88c3ba8c06616696e104b188360ebe901d7e69b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 11:00:27 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26041_20_resources' of git://github.com/skodak/moodle

commit f8b214e1cde48ae1d02798a9ab387981ee0a2158
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 10:45:46 +0800
Tag:    v2.0.2

Merge branch 'w04_MDL-26045_20_onlineblock' of git://github.com/skodak/moodle

commit e53a87dcb59247df40c92f7a9a36ca0c34400576
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 10:31:34 +0800
Tag:    v2.0.2

Merge branch 'MDL-25841' of git://github.com/timhunt/moodle

commit ab8bc2ee1cbbd29de2645cb91b3773ce54afa424
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 10:20:22 +0800
Tag:    v2.0.2

Merge branch 'MDL-25884' of git://github.com/timhunt/moodle

commit 34b681701ae15caf3296aa1a7bde38d7b26fa907
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jan 2011 10:08:32 +0800
Tag:    v2.0.2

Merge branch 'MDL-26059' of git://github.com/timhunt/moodle

commit 69f9e678a336a073b862bef34516303420c1ea9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 17:41:23 +0800
Tag:    v2.0.2

Merge branch 'MDL-25988_20_wip_enrolroles' of git://github.com/skodak/moodle

commit 13738840b2a7ee39b0913116b43634087845d40f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 15:40:50 +0800
Tag:    v2.0.2

Merge branch 'MDL-26031_20_wip_guestsession' of git://github.com/skodak/moodle

commit 07d4c7ac6e1305a3a2e975d1402c2da71e2f0d89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 15:34:43 +0800
Tag:    v2.0.2

Merge branch 'MDL-26007_20_wip_enverror' of git://github.com/skodak/moodle

commit dcad74e406c4f6bd89159252a004ea40a464dda1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 14:18:24 +0800
Tag:    v2.0.2

Merge branch 'MDL-25910_20_wip_mysqlsocket' of git://github.com/skodak/moodle

commit 093f30a3fe531637ea5ecca361104b79396b99f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 13:52:23 +0800
Tag:    v1.9.11

Merge branch 'MDL-18839_19_wip' of git://github.com/skodak/moodle into MOODLE_19_STABLE

commit e5654cad1e10d34073e5b06be2f4494846c7779e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 13:47:31 +0800
Tag:    v2.0.2

Merge branch 'MDL-25754_20_wip' of git://github.com/skodak/moodle

commit e7682e584a78f10cd48e9deb386974920febf1ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 13:38:05 +0800
Tag:    v1.9.11

Merge branch 'MDL-25754_19_wip' of git://github.com/skodak/moodle into MOODLE_19_STABLE

commit ec9b044d12e8b5e508a951c40c52be09d22e2bf9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 12:03:11 +0800
Tag:    v2.0.2

Merge rebased branch 'MDL-25769' of git://github.com/andyjdavis/moodle.git

commit 3d12d1682ea7adb33446db6ae0eaa782e962b77b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jan 2011 10:56:51 +0800
Tag:    v2.0.2

Merge branch 'MDL-25887' of git://github.com/andyjdavis/moodle.git

commit 9498654c1d6feba14bbac91de2900d3382995173
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 16:00:20 +0800
Tag:    v2.0.2

Merge branch 'MDL-17884_m20' of git://github.com/rwijaya/moodle

commit fe1f367a115e90f805ff537132ae912b0fdc3b62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 15:54:27 +0800
Tag:    v2.0.2

Merge branch 'MDL-25729_m20' of git://github.com/rwijaya/moodle

commit ca08b132e37477c7901aacff2c11cdef02324e33
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 15:36:10 +0800
Tag:    v2.0.2

Merge branch 'MDL-25860_20_wip_grpblocks' of git://github.com/skodak/moodle

commit 83be8fce3a5849f37ce90600d291d02ee97f7754
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 15:24:01 +0800
Tag:    v2.0.2

Merge branch 'MDL-25973_20_wip_charset' of git://github.com/skodak/moodle

commit c4592a2ac030bc25f16f70c3d67f4e11a1f909f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 15:12:18 +0800
Tag:    v2.0.2

Merge branch 'MDL-25971' of git://github.com/timhunt/moodle

commit 616e81cee92e27d4871c706bcf7de21c327a2a4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 13:17:04 +0800
Tag:    v2.0.2

Merge branch 'MDL-25962_20_wip_removeyui' of git://github.com/skodak/moodle

commit 242c4319ab9f4640f58f9f7caee9748c6a6043b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 13:08:33 +0800
Tag:    v2.0.2

Merge branch 'MDL-25936_wip' of git://github.com/skodak/moodle

commit bec662a0f603aceb43682874a51edd05c9600930
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 11:35:06 +0800
Tag:    v2.0.2

Merge branch 'MDL-25837_wip' of git://github.com/skodak/moodle

commit 227d6da5d870895beadc70a52a19dd7969ef8982
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 10:53:24 +0800
Tag:    v2.0.2

Merge branch 'MDL-25907_wip'

commit 0f1363069191ca2e7527067110a2d5712515e671
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 10:17:40 +0800
Tag:    v2.0.2

Merge branch 'MDL-25836_wip' of git://github.com/skodak/moodle

commit c5ea8d0bcc65b8aef879232b370b89b96e186991
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jan 2011 09:35:34 +0800
Tag:    v2.0.2

Merge branch 'MDL-25935-user_picture_fields' of git://github.com/mudrd8mz/moodle

commit 4b3c86b1528ec145fad9925be2add2288debdd5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:40:30 +0800
Tag:    v2.0.2

Merge branch 'MDL-24133' of git://git.luns.net.uk/moodle

commit 5539372b2742c694f8c03254328f1b6494cd3108
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:36:49 +0800
Tag:    v2.0.2

Merge branch 'MDL-25909' of git://git.luns.net.uk/moodle

commit 0017173f1ad98c25780408e5022ac7dc92cf380b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:26:17 +0800
Tag:    v2.0.2

Merge branch 'MDL-23393' of git://git.luns.net.uk/moodle

commit 1cc0c36e0417a05fab99d887c5b90a77c54bd57f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:12:50 +0800
Tag:    v2.0.2

Merge branch 'MDL-23425' of git://git.luns.net.uk/moodle

commit 03364f9e2f3eb5c0b5336c82adde5b9d1acc8d15
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:10:46 +0800
Tag:    v2.0.2

Merge branch 'MDL-25869' of git://git.luns.net.uk/moodle

commit 726bc5250482389360700ce0d7c915a8a601eee1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 16:01:08 +0800
Tag:    v2.0.2

Merge remote branch 'mouneyrac/MDL-25768'

commit 6b9240c55e059f7f1fa121186f5f068b6a47032c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 13:39:44 +0800
Tag:    v2.0.2

Merge branch 'MDL-23657' of git://git.luns.net.uk/moodle

commit 9e41043ca432b859d64234d4392db8cfdfe7176c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 13:33:48 +0800
Tag:    v2.0.2

Merge branch 'MDL-23224' of git://github.com/mouneyrac/moodle

commit 1861a2875a7d1502a24d5aea36b6f22dc1d454ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 13:10:33 +0800
Tag:    v2.0.2

Merge branch 'MDL-24299' of git://git.luns.net.uk/moodle

commit 34e54bbb623e5f91769a22e61baa8b3ecfb8b7a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 13:02:52 +0800
Tag:    v2.0.2

Merge branch 'MDL-25478' of git://git.luns.net.uk/moodle

commit 0d2d7a6553a7388c50047ef58b9d351779219e47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jan 2011 12:08:10 +0800
Tag:    v2.0.2

Merge branch 'MDL-25709-2' of git://git.luns.net.uk/moodle

commit dfcf4e081986df3be202e850f1bde8644bd20ba9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Jan 2011 13:47:55 +0800
Tag:    v2.0.2

Merge branch 'MDL-25525' of git://git.luns.net.uk/moodle

commit 724125bdd437fc0166e131372bc1b738e06f0502
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Jan 2011 13:30:32 +0800
Tag:    v2.0.2

Merge branch 'MDL-25657' of git://git.luns.net.uk/moodle