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

Trivial merge