Merge branch 'MDL-47073-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Nov 2015 03:54:21 +0000 (11:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Nov 2015 03:54:21 +0000 (11:54 +0800)

Trivial merge