Merge branch 'MDL-50001-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2015 01:13:19 +0000 (09:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2015 01:13:19 +0000 (09:13 +0800)

Trivial merge