Merge branch 'MDL_52574_master' of https://github.com/alexandru-elisei/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Mar 2016 04:23:52 +0000 (12:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Mar 2016 04:23:52 +0000 (12:23 +0800)

Trivial merge