Merge branch 'MDL-50790-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 06:31:49 +0000 (14:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 06:31:49 +0000 (14:31 +0800)

Trivial merge