Merge branch 'MDL-52355-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Dec 2015 02:04:51 +0000 (10:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Dec 2015 02:04:51 +0000 (10:04 +0800)

Trivial merge