Merge branch 'MDL-15187-master' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Apr 2015 00:33:11 +0000 (08:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Apr 2015 00:33:11 +0000 (08:33 +0800)

Trivial merge