Merge branch 'MDL-43185-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 4 Dec 2013 19:07:59 +0000 (08:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 4 Dec 2013 19:07:59 +0000 (08:07 +1300)

Trivial merge