Merge branch 'MDL-49234_master' of git://github.com/crazyserver/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Mar 2015 07:12:29 +0000 (15:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Mar 2015 07:12:29 +0000 (15:12 +0800)

Trivial merge