Merge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 22:36:16 +0000 (11:36 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 22:36:16 +0000 (11:36 +1300)

Trivial merge