Merge branch 'MDL-41817-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 17 Sep 2013 03:26:06 +0000 (15:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 17 Sep 2013 03:26:06 +0000 (15:26 +1200)

Trivial merge