Merge branch 'MDL-45675_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 May 2014 10:58:50 +0000 (11:58 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 26 May 2014 10:58:50 +0000 (11:58 +0100)

Trivial merge