Merge branch 'MDL-50611-master' of git://github.com/LukeCarrier/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 23 Jun 2015 02:25:36 +0000 (10:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 23 Jun 2015 02:25:36 +0000 (10:25 +0800)

Trivial merge