Merge branch 'MDL-49923-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 03:14:45 +0000 (11:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 03:14:45 +0000 (11:14 +0800)

Trivial merge