Merge branch 'MDL-38832-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 17 Dec 2013 03:20:34 +0000 (16:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 17 Dec 2013 03:20:34 +0000 (16:20 +1300)

Trivial merge