Merge branch 'MDL-49687-master' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Apr 2015 01:34:37 +0000 (09:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Apr 2015 01:34:37 +0000 (09:34 +0800)

Trivial merge