Git merges in Moodle 2.4.6 by Marina Glancy

commit b4b50810d4641546b3946e3b519ca20d1f9daeb2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 12:40:45 +0800
Tag:    v2.4.6

Merge branch 'MDL-31226-MOODLE_24_STABLE' of https://github.com/lucisgit/moodle into MOODLE_24_STABLE

commit ebb5c53b514fb405c8a3f778a97475957f44da4a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:17:33 +0800
Tag:    v2.4.6

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

commit 93334057de0d1a0a9870840b6b5333379e5bd880
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:53:35 +0800
Tag:    v2.4.6

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

commit ac23d64400883163724c9e532418692d947cf2c8
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:21:56 +0800
Tag:    v2.4.6

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

commit 89478f00cdb1abe13c187c729ae7c2aea3958827
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 17 Jul 2013 10:47:43 +0800
Tag:    v2.4.6

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

commit 18cf2255f0d85f9972c15c71505de52b52d7c4f4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 14:12:40 +0800
Tag:    v2.4.6

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

commit 35dc874292e6b6a4dfe6f81d074cea20c7fe3ca6
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 12:45:22 +0800
Tag:    v2.4.6

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

commit c291dd69ea467c7ae11d07b6580d5fc758dc62dd
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 10:53:02 +0800
Tag:    v2.4.6

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

commit 537d8f8a58d1b155d0fcbaa01c269b0a8f8f0afc
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 14:26:59 +0800
Tag:    v2.4.6

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

commit 114c924d9463719c2ff6ca151bd3c7fd178c9ec8
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 10:03:57 +0800
Tag:    v2.4.6

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

commit ed79029f0ecd2ba581b24dd42bbb1f3ca9301621
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 08:03:44 +0800
Tag:    v2.4.6

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

commit be9cd2ff26135ea1de063d0c73938ba62f708573
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 09:33:20 +0800
Tag:    v2.4.6

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