Merge branch 'MDL-52363' of git://github.com/mkassaei/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 04:33:57 +0000 (12:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 04:33:57 +0000 (12:33 +0800)

Trivial merge