Merge branch 'MDL-43145-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 22:39:09 +0000 (10:39 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 22:39:09 +0000 (10:39 +1200)

Trivial merge