Git merges in Moodle 2.5.7 by Damyon Wiese

commit 7076f1534f1b7e74593b5a1c21b6912e89cf4176
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 May 2014 12:13:52 +0800
Tag:    v2.5.7

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


commit e1c60b220ba82eede4a64772a768f377abee7a60
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 May 2014 13:30:21 +0800
Tag:    v2.5.7

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


commit 1fba34f7c780eb89ddebf8760399aa0956274864
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 May 2014 13:29:59 +0800
Tag:    v2.5.7

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


commit f7556c9e9b3f86ca6b5073835800c4ad42fbdd55
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 20:12:37 +0800
Tag:    v2.5.7

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


commit bf121f4cfc218389d2e7201cc1d29dcbb14c3fa1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 19:58:26 +0800
Tag:    v2.5.7

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


commit 9d886a4a9e8b2206044cdcb590fd5b5e317284bb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 12:53:52 +0800
Tag:    v2.5.7

Merge branch 'MDL-32543-25' of https://github.com/danielneis/moodle into MOODLE_25_STABLE


commit 12c568d7580d6e85d4fdb3fb9ceb926cee3a1985
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 12:42:44 +0800
Tag:    v2.5.7

Merge branch 'MDL-23566_25' of https://github.com/aolley/moodle into MOODLE_25_STABLE


commit bc9cb2ce499cc792286861e92c7419336a0575ae
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 May 2014 12:21:39 +0800
Tag:    v2.5.7

Merge branch 'MDL-44634-25' of https://github.com/dbezborodovrp/moodle into MOODLE_25_STABLE


commit d4b16a1462f66a6bb63640bd001a114d8c939fe6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 15 May 2014 15:35:47 +0800
Tag:    v2.5.7

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