Merge branch 'MDL-48991-master' of git://github.com/merrill-oakland/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 08:42:51 +0000 (16:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 08:42:51 +0000 (16:42 +0800)

Trivial merge