Merge branch 'MDL-49897' of https://github.com/rushi963/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Mar 2016 07:05:50 +0000 (15:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Mar 2016 07:05:50 +0000 (15:05 +0800)

Trivial merge