Merge branch 'MDL-52060-master-arn' of https://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Dec 2015 01:08:48 +0000 (09:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Dec 2015 01:08:48 +0000 (09:08 +0800)

Trivial merge