Git merges in Moodle 2.5.7 by Sam Hemelryk

commit 33fdd3fd874edecf6b417dda6c57ff3e9a6129a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 29 May 2014 10:28:01 +0800
Tag:    v2.5.7

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

commit 52292d67b029c6614fde9f3cdcab445c7e94b0a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 06:33:47 +0800
Tag:    v2.5.7

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

commit bf010218153fc289c5320d74f10fdcebe40a2183
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:58:53 +0800
Tag:    v2.5.7

Merge branch 'm25_MDL-45623' of git://github.com/totara/moodle into MOODLE_25_STABLE

commit 7babd6da4502967632ddb480b168695b7940c367
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 11:39:26 +0800
Tag:    v2.5.7

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

commit c6e2fa901f3795814248c56501e9c9a9cfe5286f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 09:59:29 +0800
Tag:    v2.5.7

Merge branch 'MDL-45603-25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit b3e480d34ec55e42e404f40841955ae337cd85f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:55:41 +0800
Tag:    v2.5.7

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

commit e44fbe93073ed3df031496a5b6b979af923e34d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 06:42:14 +0800
Tag:    v2.5.7

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

commit 5c462d30cda36b1cd23ba4cf1ef9b30b5352c9fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:53:04 +0800
Tag:    v2.5.7

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

commit d6909258f1d73fa9a338d43b3a575c660e47eab7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:47:19 +0800
Tag:    v2.5.7

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

commit 74dcc9c1bab07bf696963f4f717038e3ea7e0dbb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 May 2014 09:37:15 +0800
Tag:    v2.5.7

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