Merge branch 'MDL-49913' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Apr 2015 13:28:27 +0000 (14:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Apr 2015 13:28:27 +0000 (14:28 +0100)

Trivial merge