Merge branch 'MDL-49075-master' of https://github.com/lucisgit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Mar 2015 07:32:13 +0000 (15:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Mar 2015 07:32:13 +0000 (15:32 +0800)

Trivial merge