Merge branch 'MDL-46860-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 02:45:29 +0000 (10:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 02:45:29 +0000 (10:45 +0800)

Trivial merge