Merge branch 'MDL-51257-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:32:34 +0000 (17:32 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:32:34 +0000 (17:32 +0800)

Trivial merge