Merge branch 'MDL-51190-master' of https://github.com/pauln/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 23:53:27 +0000 (07:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 23:53:27 +0000 (07:53 +0800)

Trivial merge