Merge branch 'MDL-51673-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2015 05:38:53 +0000 (13:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2015 05:38:53 +0000 (13:38 +0800)

Trivial merge