Merge branch 'MDL-54924-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Jun 2016 04:53:35 +0000 (12:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Jun 2016 04:53:35 +0000 (12:53 +0800)

Trivial merge