Merge branch 'MDL-51007-master' of git://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 10 Aug 2015 03:07:43 +0000 (11:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 10 Aug 2015 03:07:43 +0000 (11:07 +0800)

Trivial merge