Merge branch 'MDL-51864-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 27 Oct 2015 02:57:45 +0000 (10:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 27 Oct 2015 02:57:45 +0000 (10:57 +0800)

Trivial merge