Git merges in Moodle 2.4.2 by Sam Hemelryk

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