Merge branch 'MDL-49848-master' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 02:37:53 +0000 (10:37 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 02:37:53 +0000 (10:37 +0800)

Trivial merge