Merge branch 'MDL-46200-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:38:04 +0000 (13:38 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:38:04 +0000 (13:38 +1200)

Trivial merge