Merge branch 'MDL-47590' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 16 Nov 2014 20:46:35 +0000 (09:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 16 Nov 2014 21:34:09 +0000 (10:34 +1300)

Trivial merge