Merge branch 'MDL-50980-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Sep 2015 07:07:31 +0000 (15:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Sep 2015 07:07:31 +0000 (15:07 +0800)

Trivial merge