Merge branch 'MDL-51395-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2015 05:57:22 +0000 (13:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2015 05:57:22 +0000 (13:57 +0800)

Trivial merge