Git merges in Moodle 2.6.5 by Damyon Wiese

commit 1541440ddcbf9d01834488d0081765015d641d7d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 04 Sep 2014 13:32:11 +0800
Tag:    v2.6.5

Merge branch 'wip-MDL-46464-MOODLE_26_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_26_STABLE

commit d5cfda47344cd9cb632beae8e6d9dbf6c995b81d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 01 Sep 2014 16:16:55 +0800
Tag:    v2.6.5

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

commit b7c42f0d7ea1ac770e170ef5f9d7535e061b68e6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 01 Sep 2014 15:54:40 +0800
Tag:    v2.6.5

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

commit a5580bc6187df6edd4308b550bbe1353c92816f8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 01 Sep 2014 15:35:52 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46985_7ZIP_RAR_MIME_types_missing' of https://github.com/scara/moodle into MOODLE_26_STABLE

commit dea12fe893571348585fbcededa194027b728221
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 01 Sep 2014 15:30:01 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46961' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 2b51c3212a43748a937d78b4f7b0930e106f11f2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 01 Sep 2014 13:42:06 +0800
Tag:    v2.6.5

Merge branch 'wip-MDL-39233-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 861822dc1b27662938153e8a17b07fb5a903aab2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 01 Sep 2014 11:29:49 +0800
Tag:    v2.6.5

Merge branch 'MDL-46619-2.6-visisble-authors-qanda' of https://github.com/amandadoughty/moodle into MOODLE_26_STABLE

commit e5d4b3d40920659b1fa9de9ca4f20727db831988
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 01 Sep 2014 10:56:15 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46737' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 6c4e723d6b36a8e06536ec8a360a4d2b5d06457b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 27 Aug 2014 09:56:17 +0800
Tag:    v2.6.5

Merge branch 'wip-MDL-39888-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE

commit 9a72e79050bce7361898f1ecd2f34a1b395c436f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Aug 2014 16:47:55 +0800
Tag:    v2.6.5

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

commit ea254fc7ddafcc575ad254b0eace7029480b468f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Aug 2014 16:46:29 +0800
Tag:    v2.6.5

Merge branch 'wip_MDL-43918_m26_cm' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 4b4fb1ce8b25114df6877df1c6c4614ae16c58ed
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Aug 2014 14:03:36 +0800
Tag:    v2.6.5

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

commit 4157b01343d1a4425e3529560232603dbc796027
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Aug 2014 13:54:12 +0800
Tag:    v2.6.5

Merge branch 'wip-MDL-46703-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 24d7efcec366d11c87089eb0cbfbbce1f5458e62
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Aug 2014 13:59:45 +0800
Tag:    v2.6.5

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

commit cb86d02348d70706e4d125c69025ff7431e535ba
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Aug 2014 10:22:08 +0800
Tag:    v2.6.5

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

commit a69107e549ef7d823289ff6ec47726f509f133e5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Aug 2014 14:07:39 +0800
Tag:    v2.6.5

Merge branch 'MDL-41513-Scrollbar_not_working-26' of https://github.com/MorrisR2/moodle into MOODLE_26_STABLE

commit 4e6eb5b8be7ed4c87db0ebf21fb040d4335d24f8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Aug 2014 13:15:13 +0800
Tag:    v2.6.5

Merge branch 'MDL-46188_m26' of https://github.com/shashirepo/moodle into MOODLE_26_STABLE

commit e2aa68b154a43802d52eb210ee4341acd61c97ab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Aug 2014 12:41:29 +0800
Tag:    v2.6.5

Merge branch 'm26_MDL-46760' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE