Merge branch 'MDL-54630_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 07:03:14 +0000 (15:03 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 07:03:14 +0000 (15:03 +0800)

Trivial merge