Merge branch 'MDL-45104-master-fix' of github.com:xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Feb 2016 02:14:06 +0000 (10:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Feb 2016 02:14:06 +0000 (10:14 +0800)

Trivial merge