Git merges in Moodle 2.5.7 by Marina Glancy

commit a267e328486bab57eda672d10505ae4de9783049
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:47:54 +0800
Tag:    v2.5.7

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

commit ccffe26dbb3171f6116275ba4da7e1a26eb4d406
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 26 May 2014 14:47:45 +0800
Tag:    v2.5.7

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

commit f7bb24c2c9e2aa2dc8967f1ab6412950d431c8e4
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:30:38 +0800
Tag:    v2.5.7

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

commit f5ad923b9702656a34da3fb5b361b0cf4248452d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:27:07 +0800
Tag:    v2.5.7

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

commit c962724c1906fd3f4e81374031df4dbe962a2b68
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:23:07 +0800
Tag:    v2.5.7

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

commit bced459a23fcde65ccfc5958d78fa9e6bc6d481d
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 14:12:13 +0800
Tag:    v2.5.7

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

commit dd206a8daa6f45769cb6c9c650f1f6bda98822e2
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 20 May 2014 09:53:02 +0800
Tag:    v2.5.7

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

commit c24b3e19899869021fba3e18a0caa4bcd638c56a
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 19 May 2014 15:57:34 +0800
Tag:    v2.5.7

Merge branch 'wip-MDL-45483-MOODLE_25_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_25_STABLE

commit b91be533d11263f6e0b749d8af5ca49b0ce4ff63
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 14 May 2014 16:36:52 +0800
Tag:    v2.5.7

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