Merge branch 'MDL-53152-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 1 Aug 2016 07:04:17 +0000 (15:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 1 Aug 2016 07:04:17 +0000 (15:04 +0800)

Trivial merge