Merge branch 'MDL-40607-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 22:40:57 +0000 (11:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 22:40:57 +0000 (11:40 +1300)

Trivial merge