Merge branch 'wip-MDL-50881-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 04:03:23 +0000 (12:03 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 04:03:23 +0000 (12:03 +0800)

Trivial merge