Merge branch 'MDL-45772-master-4' of git://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 01:56:47 +0000 (09:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 01:56:47 +0000 (09:56 +0800)

Trivial merge