Merge branch 'MDL-45096-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 24 Apr 2014 00:14:34 +0000 (12:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 24 Apr 2014 00:14:34 +0000 (12:14 +1200)

Trivial merge