Merge branch 'MDL-43252-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 22:03:39 +0000 (11:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 22:03:39 +0000 (11:03 +1300)

Trivial merge