Merge branch 'MDL-49762_master' of git://github.com/nadavkav/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 13 Apr 2015 05:38:02 +0000 (13:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Apr 2015 07:32:11 +0000 (15:32 +0800)

Trivial merge