Merge branch 'master_MDL-46805' of https://github.com/danmarsden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Mar 2015 00:15:23 +0000 (08:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Mar 2015 00:15:23 +0000 (08:15 +0800)

Trivial merge