Merge branch 'MDL-52519' of https://github.com/rushi963/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 02:18:41 +0000 (10:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 02:18:41 +0000 (10:18 +0800)

Trivial merge