Git merges in Moodle 2.5.4 by Damyon Wiese

commit 4fc875458868cfa6cbd009e68fa47198e10c1dc8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Jan 2014 14:20:14 +0800
Tag:    v2.5.4

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit dd7f25835e32082cc05d3862ac3100899f703dcd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 12:52:26 +0800
Tag:    v2.5.4

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

commit 5ca04a7039bf43ade63779484ea6aee16bb77e3f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 09:21:54 +0800
Tag:    v2.5.4

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

commit f81aec80ad98f0c72aac7991cb46a3761e319abf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 16:14:41 +0800
Tag:    v2.5.4

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

commit 331ecb86f96425b0fe7f4fbe16959b5c6ed25e35
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 14:50:39 +0800
Tag:    v2.5.4

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

commit fe17c7e8e65b582330a0950e71891ad08be07ae0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 20 Dec 2013 11:57:38 +0800
Tag:    v2.5.4

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 247901a4f77ac827dab97e07507ef59f4eff3baa
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 17:30:15 +0800
Tag:    v2.5.4

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

commit a87ae3371d45160087ba093f0eba2e0ea1570d60
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 16:12:27 +0800
Tag:    v2.5.4

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

commit 73e2de1ff902529fc67b10c7e05f10858f32eff5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:44:09 +0800
Tag:    v2.5.4

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

commit 05d6010d2c3ef4523cf646d5f9a7d80e9942e92f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:16:53 +0800
Tag:    v2.5.4

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

commit ccd4e10e00762ca6a6eb969b5fd32cae01ed16ec
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 14:36:33 +0800
Tag:    v2.5.4

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

commit bf44c1e521d8f380d44e3647e11cd622a9d56b3c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 14:03:26 +0800
Tag:    v2.5.4

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

commit d1dd8b1496757826a1af6238c2d04cba03075b57
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 13:16:51 +0800
Tag:    v2.5.4

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

commit 818c05cd0e964fae26fb193100661fac50e6b42f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 12:30:46 +0800
Tag:    v2.5.4

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

commit 5a2d5cfaf1ad62d58fced93e882c54740d29dfc5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Nov 2013 09:51:36 +0800
Tag:    v2.5.4

Merge branch 'm25_MDL-40223' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit e9182f584fc7e85ee837517684e6b228504efe9c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:27:53 +0800
Tag:    v2.5.4

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

commit 9bd2c37acc1f03c159e5c21e52f8f6fb78631414
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:21:20 +0800
Tag:    v2.5.4

Merge branch 'm25_MDL-41695' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 22000e52b7680d2127226cd13ddd55d4a1ba1d8d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 14:54:17 +0800
Tag:    v2.5.4

Merge branch 'MDL-42582-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit 175137de180ef01d54035f48ae38d20cce3c763c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 14:35:34 +0800
Tag:    v2.5.4

Merge branch 'MDL-42598_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit ef9b7c943b4ff0b7283ea450911aa79e7ec8e09d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 13:11:19 +0800
Tag:    v2.5.4

Merge branch 'MDL-33536-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

commit 5a668a8c81799be8769cac355f895e67088f7a40
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Nov 2013 10:04:38 +0800
Tag:    v2.5.4

Merge branch '42806-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit a97d655d8f750328fb8cea3cfbe5e35435507f54
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 17:17:13 +0800
Tag:    v2.5.4

Merge branch 'MDL-42803-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE