Merge branch 'MDL-32188' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 9 Oct 2013 19:34:11 +0000 (08:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 9 Oct 2013 19:34:11 +0000 (08:34 +1300)

Trivial merge