Merge branch 'MDL-56826-master-fix1' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 12:25:31 +0000 (20:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 12:25:31 +0000 (20:25 +0800)

Trivial merge