Merge branch 'MDL-49748-master' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:17:26 +0000 (15:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:17:26 +0000 (15:17 +0800)

Trivial merge