Merge branch 'MDL-51053-master' of git://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:23:29 +0000 (08:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:23:29 +0000 (08:23 +0800)

Trivial merge