Merge branch 'MDL-25721_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Mar 2015 09:50:44 +0000 (10:50 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Mar 2015 09:50:44 +0000 (10:50 +0100)

Trivial merge