Merge branch 'MDL-50652_master' of git://github.com/reskit/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Jun 2015 05:01:51 +0000 (13:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Jun 2015 05:01:51 +0000 (13:01 +0800)

Trivial merge