Merge branch 'MDL-49928-master' of git://github.com/ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Apr 2015 05:40:44 +0000 (13:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Apr 2015 05:40:44 +0000 (13:40 +0800)

Trivial merge