Git merges in Moodle 2.4.6 by Damyon Wiese

commit c8b1ecedc7ca85f88028891c9f8524b48409bad9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Sep 2013 12:26:39 +0800
Tag:    v2.4.6

Merge branch 'MDL-41485-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 13ad8def1b46591832cc63d013f916d22f6ac832
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 16:10:13 +0800
Tag:    v2.4.6

Merge branch 'MDL-41348_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit e75bd18064400b07897c13c90d8b5e0089d4b38a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:38:52 +0800
Tag:    v2.4.6

Merge branch 'MDL-33472-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 7a35f9f9fcfad654e516d75889aa61de5536b791
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:29:37 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-29218_plugin_init_not_blocking_when_false' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit 6026b9157de6955d5e37cdf86898b7b4d9ad693c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:16:38 +0800
Tag:    v2.4.6

Merge branch 'MDL-32690_restoreMissingAssignment_24' of https://github.com/moodlerooms/moodle into MOODLE_24_STABLE

commit 08d19eaeb96fd0505828747b85710321bb37dce6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:08:43 +0800
Tag:    v2.4.6

Merge branch 'MDL-41401-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit e4e617356864c9a8ddbf32e9943ec7e53567c859
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:50:04 +0800
Tag:    v2.4.6

Merge branch 'MDL-40877-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 58605be7f21b6ec2e50f1f7709c1c9fb83a77bd6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:29:59 +0800
Tag:    v2.4.6

Merge branch 'MDL-40447_M24' of https://github.com/nadavkav/moodle into MOODLE_24_STABLE

commit 33fec82b0a205e12d53165cfa3bfbd04e6148b58
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 16:20:47 +0800
Tag:    v2.4.6

Merge branch '41213-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 1e275366464e2cbeba2c9091469d34ba32debc39
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 13:51:21 +0800
Tag:    v2.4.6

Merge branch 'mdl24_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https://github.com/brki/moodle into MOODLE_24_STABLE

commit 4e66dc96b353c5274e37aa5f29593858bcf4fe33
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:44:17 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-41106-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 527b36b905c6b1d762af8a297d2755b6feb1454f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:33:41 +0800
Tag:    v2.4.6

Merge branch 'MDL-36803-m24' of https://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit c951ff9d39a0e4191f5639368c354ccafc6336dd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 22 Aug 2013 11:23:17 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-41196-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 86cef7fbcabb3230ba99b73f9c283d9e50b50d6c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:18:36 +0800
Tag:    v2.4.6

Merge branch 'MDL-41191-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit b1cd2f8248a55c55fe51a1545ca915f9ea0df569
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 15:21:43 +0800
Tag:    v2.4.6

Merge branch 'w33_MDL-41112_m24_cachedist' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 59c487a7f3f2f82835aa597d7d2e6a9f1e07b5f7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 13:53:52 +0800
Tag:    v2.4.6

Merge branch 'MDL-27595-2_24' of https://github.com/bostelm/moodle into MOODLE_24_STABLE

commit 18c49b1420849f75591221b947d8860380adb1d4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 13:02:26 +0800
Tag:    v2.4.6

Merge branch 'MDL-41036_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit d161d6bbe93cdf0d3045c3f23d36b0f13add39ce
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 12:30:43 +0800
Tag:    v2.4.6

Merge branch 'MDL-41122_2.4' of git://github.com/kastashov/moodle into MOODLE_24_STABLE

commit 7452709d699925425614f2aac0e197854e2ae25d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 15:44:17 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-39572' of https://github.com/totara/moodle into MOODLE_24_STABLE

commit 79b958a4a747840888ed4ebbbe4bcec7cb128c25
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:51:42 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-41106-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit c93707771fc255712968b15ed25b7e9e6b427362
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:16:39 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-36789-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit 7d6f0b8224fcd8ec55a6ce2340c5f2057f9a448d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 05 Aug 2013 09:02:41 +0800
Tag:    v2.4.6

Merge branch 'MDL-34989-24' of git://github.com/damyon/moodle into MDL-34989-24

commit 4cf35a316ecaa3f45b133328ce173931cd0c8730
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:16:27 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-40260' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit a04662aad4be2903cf4c1af11422904451d4a1b3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:04:40 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-40174-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 855b35604d75bbafaca647fc521fee69b5baa8ac
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Jul 2013 09:24:02 +0800
Tag:    v2.4.6

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit 4474895d37bbf487ee96e909eabe18d50c22e7df
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:31:52 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-40621-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit a2de489c3ec5db792a9d89146b5e7517cf8e8cde
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 13:29:19 +0800
Tag:    v2.4.6

Merge branch 'MDL-40195_24' of git://github.com/aolley/moodle into MOODLE_24_STABLE

commit 994d7ebdc35b1add9ca895b909abf892fa5b36df
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 11:29:28 +0800
Tag:    v2.4.6

Merge branch 'w29_MDL-40558_m24_guestdelete' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit a7228f586b7eb0e52dbc9f321b40c66fbd0ab026
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 10:26:56 +0800
Tag:    v2.4.6

Merge branch 'MDL-40538_24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE

commit ae5e95af2db4bac0023b3422af2e801f475fa9f0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 15:06:08 +0800
Tag:    v2.4.6

Merge branch 'MDL-39563-24' of git://github.com/jleyva/moodle into MOODLE_24_STABLE

commit 95455fc76aa56376007eddfa6f37b59b01338bb4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Jul 2013 09:42:53 +0800
Tag:    v2.4.6

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit 4dcd07386464fada36d778d897376ff1c7245fcd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:44:21 +0800
Tag:    v2.4.6

Merge branch 'MDL-39420_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 800c5757c30a7acc209aa1eb1a4b53c7a50dea8b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:27:59 +0800
Tag:    v2.4.6

Merge branch 'MDL-36479_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 1f304be72c06db1002bf09cf00eef6cda1b82bd5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 15:16:32 +0800
Tag:    v2.4.6

Merge branch 'MDL-40443_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit d3dc9a334ceb295d598774d7a9c65840342b9851
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 13:27:05 +0800
Tag:    v2.4.6

Merge branch 'MDL-40499_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE

commit b7aac8b6d16ae14f0ab791424611a79745de082e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 11:13:23 +0800
Tag:    v2.4.6

Merge branch 'MDL-40318_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 92cfad95c8bb953b4120daca90aec7d1701b1aeb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 16:40:39 +0800
Tag:    v2.4.6

Merge branch 'MDL-38314-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 51cefce972237d79007eede098743fa55d399d0e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 15:16:42 +0800
Tag:    v2.4.6

Merge branch 'MDL-38314-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE