Git merges in Moodle 2.6.1 by Damyon Wiese

commit 8aaad0d2b6bce7bc42dd9d1b25d16a56a723823e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Jan 2014 14:20:52 +0800
Tag:    v2.6.1

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit 708e0804b8affa9ccdb00db5b2ca36475cc89daf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 13:33:53 +0800
Tag:    v2.6.1

Merge branch 'w01_MDL-43585_m26_userlib' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 3a8e16ecabe64d5294e390b24c3bf53ed3f5addd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 12:52:49 +0800
Tag:    v2.6.1

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

commit 28abbabae537d441230b184aac4e6c5cf34b71c1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 09:22:15 +0800
Tag:    v2.6.1

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

commit 9ce83d090862fe2d116a6f4eb9aed63be63b5504
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 16:14:02 +0800
Tag:    v2.6.1

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

commit 0f399f7f74e3fab5ed82e9fd8f52e3ffb8da7aa9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 15:52:17 +0800
Tag:    v2.6.1

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

commit 5726fe62639b591b6dcd6fa7d820d3f185720739
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 14:51:16 +0800
Tag:    v2.6.1

Merge branch 'w01_MDL-36721_m26_passlog' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 996c1d5b1577218c7085ef69a75b93fb4f67109e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 20 Dec 2013 11:58:07 +0800
Tag:    v2.6.1

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit cb891e57f0fcf557ae4f7a6d761b3380608f5352
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 17:29:57 +0800
Tag:    v2.6.1

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

commit 4e14b95f0ee3178ae6af3de94a10556291ce7c22
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 16:29:39 +0800
Tag:    v2.6.1

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

commit 4d32c0c6d0f4f7a71c8541bfec3a3871d839e632
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 16:12:08 +0800
Tag:    v2.6.1

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

commit e2a2209ed6ddb7cd3e41efef3928318871aecc1c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:43:53 +0800
Tag:    v2.6.1

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

commit 1cf504414d7682533893bfeb4c709940389b7999
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:25:36 +0800
Tag:    v2.6.1

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

commit 88c5d93aa1fdd4b3b6003781268858e9bab3adb0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 14:37:03 +0800
Tag:    v2.6.1

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

commit 39177fd3a7f41fa0178036d60eded23fdd98fa58
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 11:23:23 +0800
Tag:    v2.6.1

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

commit 2f6a01e094d36803a5961f7e496fc57e8a11716f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 09:51:08 +0800
Tag:    v2.6.1

Merge branch '43033-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 1e9c117f503c9c6948468b4992bd6443b9817bcc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Nov 2013 16:59:04 +0800
Tag:    v2.6.1

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

commit 5f9aa41321188c420ab49cc9d3c471e1f8db0feb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Nov 2013 09:33:36 +0800
Tag:    v2.6.1

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

commit a1554ea241b9bebce4194c2656b1fba268f195e4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 14:02:30 +0800
Tag:    v2.6.1

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

commit 025bd122a61ac56350f3fe6bb1345e40c0f3d0a0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 13:16:37 +0800
Tag:    v2.6.1

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

commit c3208c17d1d382ea934eed542bdbe48864a7a99a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 12:30:23 +0800
Tag:    v2.6.1

Merge branch 'MDL-42913a-26' of https://github.com/srynot4sale/moodle into MOODLE_26_STABLE

commit 49d367d47e3e491bc84e21676bfd0626e3971b18
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Nov 2013 09:50:49 +0800
Tag:    v2.6.1

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

commit 52454bedeea415045d9c7c438ee2f414d4769392
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 16:08:31 +0800
Tag:    v2.6.1

Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit 02e45bf2695ec71370ed160086d1df1ad976a875
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:27:22 +0800
Tag:    v2.6.1

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

commit 28fccc09ce23ab2199fbf0f16638c7c7c0ecc84a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:21:01 +0800
Tag:    v2.6.1

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

commit d29a7827c4c422623f58501a0b4148e0abac49bf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 14:04:23 +0800
Tag:    v2.6.1

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