Merge branch 'MDL-42951-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 1 Dec 2013 21:52:11 +0000 (10:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 1 Dec 2013 21:52:11 +0000 (10:52 +1300)

Trivial merge