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

Trivial merge