Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 02:14:41 +0000 (10:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 02:14:41 +0000 (10:14 +0800)

Trivial merge