Merge branch 'mdl51440-master' of git://github.com/tlock/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 02:48:25 +0000 (10:48 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 02:48:25 +0000 (10:48 +0800)

Trivial merge