Merge branch 'MDL-45594_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 11:54:15 +0000 (12:54 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 11:54:15 +0000 (12:54 +0100)

Trivial merge