Merge branch 'MDL-47381' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 20:06:35 +0000 (09:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 20:06:35 +0000 (09:06 +1300)

Trivial merge