Merge branch 'MDL-49845-fix-master' of git://github.com/gurgus/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 May 2015 02:28:50 +0000 (10:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 May 2015 02:28:50 +0000 (10:28 +0800)

Trivial merge