Merge branch 'MDL-46497_master' of https://github.com/nadavkav/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2015 05:35:24 +0000 (13:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2015 05:35:24 +0000 (13:35 +0800)

Trivial merge