Merge branch 'MDL-40436-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 15 Dec 2013 22:31:29 +0000 (11:31 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 15 Dec 2013 22:31:29 +0000 (11:31 +1300)

Trivial merge