Merge branch 'MDL-49946' of https://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Apr 2015 12:32:33 +0000 (13:32 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:19 +0000 (10:19 +0100)

Trivial merge