Merge branch 'master_MDL-45712' of git://github.com/danmarsden/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 03:14:09 +0000 (11:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 03:14:09 +0000 (11:14 +0800)

Trivial merge