Merge branch 'MDL-41210-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 22:21:04 +0000 (10:21 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 22:21:04 +0000 (10:21 +1200)

Trivial merge