Merge branch 'MDL-50720' of git://github.com/bostelm/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:27:09 +0000 (08:27 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:27:09 +0000 (08:27 +0800)

Trivial merge