Merge branch 'MDL-42188' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 19:52:42 +0000 (08:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 19:52:42 +0000 (08:52 +1300)

Trivial merge