Merge branch 'MDL-43628' of https://github.com/scyrma/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 16 Nov 2014 22:44:57 +0000 (11:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 16 Nov 2014 22:44:57 +0000 (11:44 +1300)

Trivial merge