Merge branch 'MDL-34989-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 05:51:30 +0000 (17:51 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 05:51:30 +0000 (17:51 +1200)

Trivial merge