Merge branch 'MDL-45265-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 06:54:54 +0000 (14:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 06:54:54 +0000 (14:54 +0800)

Trivial merge