Merge branch 'MDL-41039-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 23:10:08 +0000 (12:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 23:10:08 +0000 (12:10 +1300)

Trivial merge