Merge branch 'MDL-45479-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 May 2014 01:09:34 +0000 (13:09 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 May 2014 01:09:34 +0000 (13:09 +1200)

Trivial merge