Merge branch 'MDL-50839-master' of git://github.com/Dave-B/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:32:11 +0000 (08:32 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:32:11 +0000 (08:32 +0800)

Trivial merge