Merge branch 'MDL-44748-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 03:18:52 +0000 (15:18 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 03:18:52 +0000 (15:18 +1200)

Trivial merge