Merge branch 'MDL-56576_master-fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 Nov 2016 00:28:08 +0000 (08:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 Nov 2016 00:28:08 +0000 (08:28 +0800)

Trivial merge