Merge branch 'MDL-51170-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 Sep 2015 06:14:09 +0000 (14:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 Sep 2015 06:14:09 +0000 (14:14 +0800)

Trivial merge