Merge branch 'MDL-43415-master' of git://github.com/zbdd/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 05:16:39 +0000 (13:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 05:16:39 +0000 (13:16 +0800)

Trivial merge