Merge branch 'MDL-51083-master' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 08:57:06 +0000 (16:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 08:57:06 +0000 (16:57 +0800)

Trivial merge