Merge branch 'MDL-47003-master' of git://github.com/merrill-oakland/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 02:17:28 +0000 (10:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 02:17:28 +0000 (10:17 +0800)

Trivial merge