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

Trivial merge