Merge branch 'MDL-38485-master' of git://github.com/ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Mar 2015 08:05:03 +0000 (16:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Mar 2015 08:05:03 +0000 (16:05 +0800)

Trivial merge