Merge branch 'MDL-42138-master' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Feb 2015 09:18:33 +0000 (17:18 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Feb 2015 09:18:33 +0000 (17:18 +0800)

Trivial merge