Merge branch 'MDL-48342' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Dec 2014 16:31:15 +0000 (16:31 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 11:37:52 +0000 (11:37 +0000)

Trivial merge