Merge branch 'wip-MDL-49846-master-fix' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 06:57:18 +0000 (14:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 06:57:18 +0000 (14:57 +0800)

Trivial merge