Merge branch 'MDL-54055-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 07:00:39 +0000 (15:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 07:00:39 +0000 (15:00 +0800)

Trivial merge