Merge branch 'MDL-49932_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 30 Apr 2015 02:25:27 +0000 (10:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 30 Apr 2015 02:25:27 +0000 (10:25 +0800)

Trivial merge