Merge branch 'MDL-51181-m' of git://github.com/micaherne/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Aug 2015 02:55:08 +0000 (10:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Aug 2015 02:55:08 +0000 (10:55 +0800)

Trivial merge