Merge branch 'wip-MDL-10405-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Feb 2015 09:07:58 +0000 (17:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Feb 2015 09:07:58 +0000 (17:07 +0800)

Trivial merge