Merge branch 'MDL-49545-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 15 Oct 2015 03:54:53 +0000 (11:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 15 Oct 2015 03:54:53 +0000 (11:54 +0800)

Trivial merge