Merge branch 'wip-MDL-13831-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 03:51:09 +0000 (11:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 03:51:09 +0000 (11:51 +0800)

Trivial merge