Merge branch 'MDL-48362-master-fix2' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 06:31:29 +0000 (14:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 06:31:29 +0000 (14:31 +0800)

Trivial merge