Git merges in Moodle 2.6.5 by Marina Glancy

commit 6e4c10f98701095abb71fc642b3ca6c42ed89f0a
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 03 Sep 2014 16:59:38 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46639' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 390645bd44a18a53a74cceae3e6015d2708688e3
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 02 Sep 2014 09:59:20 +0800
Tag:    v2.6.5

Merge branch 'MDL-45952_26' of git://github.com/Syxton/moodle into MOODLE_26_STABLE

commit bb5b3ee2633a739842a77713a25083fe4aae169b
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 01 Sep 2014 14:35:39 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46639' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 6e1fdb09514fcee0333b8410d04a87df362a07e0
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 01 Sep 2014 14:35:33 +0800
Tag:    v2.6.5

Merge branch 'MDL-46539-fix-26' of https://github.com/jmarthaler/moodle into MOODLE_26_STABLE

commit 124aa2558a4be20f3a22097c9b3790d3dc734f3c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:54:08 +0800
Tag:    v2.6.5

Merge branch 'MDL-46894_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 514a13e43188774499821c97ff18fca562ea2bb4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 25 Aug 2014 16:30:01 +0800
Tag:    v2.6.5

Merge branch 'M26_MDL46887_assignment_file_max_size' of git://github.com/Dave-B/moodle into MOODLE_26_STABLE

commit ebb8098668f63fa7652ec1dbd1bf3a781d048db9
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 21 Aug 2014 10:18:46 +0800
Tag:    v2.6.5

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 2a8877376a91cc9e8d751bd8178fccf9357e0346
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 16:53:09 +0800
Tag:    v2.6.5

Merge branch 'MDL-46538_M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE

commit 26929ce1a7d62dab9c4bfea52e1ea3cb4e44c153
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 16:23:00 +0800
Tag:    v2.6.5

Merge branch 'MDL-46281-MOODLE_26_STABLE' of git://github.com/lucisgit/moodle into MOODLE_26_STABLE

commit 3e15af69dee4824f20dc773b7728863c0d38007d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:22:01 +0800
Tag:    v2.6.5

Merge branch 'MDL-46833-MOODLE_26_STABLE' of git://github.com/lucisgit/moodle into MOODLE_26_STABLE

commit 0f9d61091b405f8a8c868670f40e6ede15cbc850
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 14:04:21 +0800
Tag:    v2.6.5

Merge branch 'wip-mdl-46817-m26' of git://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit f09f95fefab7db1be0b2da12d02f1038f559c6b9
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 13:26:19 +0800
Tag:    v2.6.5

Merge branch 'MDL-43197-26-2nd' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit c8c0aa21e439856403fd52d4916dfd7731f7ea35
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 19 Aug 2014 11:22:09 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46775' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit aec0fcdb6e8df94d14aa8db263ffdb67dfb8cd32
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 14 Aug 2014 14:52:15 +0800
Tag:    v2.6.5

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 63edba375c531e8d1f543ab6aa488c55e12cdbf8
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 16:03:07 +0800
Tag:    v2.6.5

Merge branch 'MDL-46308_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 530da41f3008608cc61fbc56d24a8696268ea2d5
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 16:02:29 +0800
Tag:    v2.6.5

Merge branch 'MDL-21042_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE

commit 0a94ca976574b2bc619c3333c32ad6a6c87ab05c
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:03:00 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46315' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit a17f12e8018e68323ae91582d4e670db38318c12
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:02:51 +0800
Tag:    v2.6.5

Merge branch 'MDL-46600_import_failed_26' of git://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit 0faeeeea2701e97f588acd588e1b976609ad53a1
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 15:02:36 +0800
Tag:    v2.6.5

Merge branch 'wip_MDL-46480_m26_footernan' of git://github.com/skodak/moodle into MOODLE_26_STABLE

commit c750f3de630c3c322e659ae2cc572c445f5a9720
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 13:32:03 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46643' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit af8ef3b1da1c0c2600095bdf404e9e3dffdc9421
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 12 Aug 2014 13:29:43 +0800
Tag:    v2.6.5

Merge branch 'MDL-43740_manual_none_26' of git://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit 8e349b6d67416ca6607cb6e32cd9a8332384e50c
Author: Marina Glancy <marina@moodle.com>
Date:   Thu, 07 Aug 2014 13:15:00 +0800
Tag:    v2.6.5

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 3000cb1ee213d9b8f15420e183facf3f698afd53
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 14:25:16 +0800
Tag:    v2.6.5

Merge branch 'MDL-44794-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE

commit 216da8ebb06b370ee48a0728b031625f2c4698a4
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 04 Aug 2014 11:25:10 +0800
Tag:    v2.6.5

Merge branch 'MDL-46457_26' of git://github.com/aolley/moodle into MOODLE_26_STABLE

commit 2d1ac616e8bd7d7ab477a869ff88ff571302f465
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 29 Jul 2014 11:59:29 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46325' of git://github.com/totara/moodle into MOODLE_26_STABLE