Git merges in Moodle 2.5.7 by Dan Poltawski

commit aadf64b7f64a68155e5e19474518d8e935619c18
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 20:34:10 +0800
Tag:    v2.5.7

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


commit d4a84d8f0caf8b5ae54cb6ca13349a55f8269573
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 15:55:14 +0800
Tag:    v2.5.7

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


commit 9ace4d026e7fa3c0304e2a0b9cd4de06180da8a6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 12:21:59 +0800
Tag:    v2.5.7

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


commit a06c905d0717ed7253156a7c95d846cb4dc22fb6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:51:32 +0800
Tag:    v2.5.7

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


commit c6e7b00ca5637e45c5b83f4c7670d9b8d6ad0577
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:24:46 +0800
Tag:    v2.5.7

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


commit 4fbc0fcb1dd2a746cc483201d8d166f81060bc79
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 10:14:30 +0800
Tag:    v2.5.7

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


commit 1151c25eda6e49e9ea10dd7423a2e29eabd3fc3e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 09:50:55 +0800
Tag:    v2.5.7

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


commit 8afd9fd8867728bfedcb0c22879041aab4278fdb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 09:47:54 +0800
Tag:    v2.5.7

Merge branch 'MDL-45432-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_STABLE


commit 9813e71861ca678e26f48add87387aa169f7d7e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 May 2014 09:46:39 +0800
Tag:    v2.5.7

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