Merge branch 'MDL-40552-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 03:13:40 +0000 (16:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 03:13:40 +0000 (16:13 +1300)

Trivial merge