Merge branch 'MDL-55604' of https://github.com/mr-russ/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 24 Aug 2016 01:35:39 +0000 (09:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 24 Aug 2016 01:35:39 +0000 (09:35 +0800)

Trivial merge