Merge branch 'MDL-45135-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 20:47:16 +0000 (08:47 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 20:47:16 +0000 (08:47 +1200)

Trivial merge