Merge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 02:50:48 +0000 (15:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 02:50:48 +0000 (15:50 +1300)

Trivial merge