Merge branch 'MDL-45086-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Apr 2014 21:50:38 +0000 (09:50 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Apr 2014 21:50:38 +0000 (09:50 +1200)

Trivial merge