Merge branch 'wip-MDL-47729-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 01:49:05 +0000 (09:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 01:49:05 +0000 (09:49 +0800)

Trivial merge