Merge branch 'MDL-49783-master' of git://github.com/mastnym/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 May 2015 01:42:21 +0000 (09:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 May 2015 01:42:21 +0000 (09:42 +0800)

Trivial merge