Merge branch 'MDL-50852-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2015 07:38:00 +0000 (15:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2015 07:38:00 +0000 (15:38 +0800)

Trivial merge