Merge branch 'MDL-47002-master' of git://github.com/merrill-oakland/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 06:59:05 +0000 (14:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 06:59:05 +0000 (14:59 +0800)

Trivial merge