Merge branch 'MDL-41888-master' of git://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 29 Sep 2013 21:38:11 +0000 (10:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 29 Sep 2013 21:38:11 +0000 (10:38 +1300)

Trivial merge