Merge branch 'MDL-31487' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 11 Aug 2013 23:02:48 +0000 (11:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 11 Aug 2013 23:02:48 +0000 (11:02 +1200)

Trivial merge