Merge branch 'MDL-49604-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Apr 2015 04:44:07 +0000 (12:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Apr 2015 04:44:07 +0000 (12:44 +0800)

Trivial merge