Merge branch 'MDL-49167-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 09:01:15 +0000 (17:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 09:01:15 +0000 (17:01 +0800)

Trivial merge