Merge branch 'MDL-52309' of https://github.com/smbader/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 01:33:36 +0000 (09:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 01:33:36 +0000 (09:33 +0800)

Trivial merge