Merge branch 'MDL-34375_m29v2' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Feb 2015 03:40:27 +0000 (11:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Feb 2015 03:40:27 +0000 (11:40 +0800)

Trivial merge