Merge branch 'MDL-52457-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Dec 2015 03:58:59 +0000 (11:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Dec 2015 03:58:59 +0000 (11:58 +0800)

Trivial merge