Merge branch 'MDL-55367-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Aug 2016 06:41:47 +0000 (14:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Aug 2016 06:41:47 +0000 (14:41 +0800)

Trivial merge