Merge branch 'MDL-51779_master' of https://github.com/Syxton/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Oct 2015 01:46:38 +0000 (09:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Oct 2015 01:46:38 +0000 (09:46 +0800)

Trivial merge