Git merges in Moodle 2.5.1 by Marina Glancy

commit 8526be5612f57b6b8a1984182ff4e7f5b15e6c86
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 13:38:20 +0800
Tag:    v2.5.1

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

commit 4d7c173514a63cba8acfb63feed89db9142cb829
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 10:57:06 +0800
Tag:    v2.5.1

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

commit 04597742cf5d4fbc22085433398eb9053868eeb0
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 18 Jun 2013 09:13:26 +0800
Tag:    v2.5.1

Merge branch 'MDL-38079_25' of git://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit 29a45089300d62cd8586eebf7ab6fbfdf192a6ae
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 17 Jun 2013 08:40:39 +0800
Tag:    v2.5.1

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

commit 37d38a3125d752135d5d790d15b689faeaed652d
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 14 Jun 2013 11:50:50 +0800
Tag:    v2.5.1

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