Merge branch 'MDL-45312' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Apr 2014 22:24:20 +0000 (10:24 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Apr 2014 22:24:20 +0000 (10:24 +1200)

Trivial merge