Merge branch 'MDL-41600' of git://github.com/aolley/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 01:12:13 +0000 (13:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 01:12:13 +0000 (13:12 +1200)

Trivial merge