Merge branch 'MDL-40527' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Jul 2013 22:31:39 +0000 (10:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Jul 2013 22:31:39 +0000 (10:31 +1200)

Trivial merge