Git merges in Moodle 2.1.2 by Sam Hemelryk

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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