Merge branch 'MDL-49923-master-fix1' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 10:06:26 +0000 (18:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 10:06:26 +0000 (18:06 +0800)

Trivial merge