Merge branch 'MDL-56895-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Nov 2016 01:51:07 +0000 (09:51 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:35 +0000 (09:07 +0000)

Trivial merge