Merge branch 'MDL-51014-master' of git://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 11 Aug 2015 05:08:11 +0000 (13:08 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 11 Aug 2015 05:08:11 +0000 (13:08 +0800)

Trivial merge