Merge branch 'MDL-40517-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 21:32:06 +0000 (10:32 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 21:32:06 +0000 (10:32 +1300)

Trivial merge