Merge branch 'MDL-41162' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 21 Aug 2013 00:13:34 +0000 (12:13 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 21 Aug 2013 00:13:34 +0000 (12:13 +1200)

Trivial merge