Merge branch 'MDL-57588' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jan 2017 11:39:05 +0000 (11:39 +0000)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Feb 2017 05:01:27 +0000 (13:01 +0800)

Trivial merge