Merge branch 'master_MDL-46390' of https://github.com/danmarsden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Mar 2015 23:52:55 +0000 (07:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Mar 2015 23:52:55 +0000 (07:52 +0800)

Trivial merge