Merge branch 'MDL-26429-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2015 04:12:43 +0000 (12:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2015 04:12:43 +0000 (12:12 +0800)

Trivial merge