Merge branch 'MDL-40881_master' of https://github.com/nadavkav/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Apr 2015 03:17:16 +0000 (11:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Apr 2015 03:17:16 +0000 (11:17 +0800)

Trivial merge