Merge branch 'MDL-38286-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:31:43 +0000 (09:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:31:43 +0000 (09:31 +1200)

Trivial merge