Git merges in Moodle 2.4.6 by Sam Hemelryk

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