Merge branch 'MDL-27183' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 14 Dec 2011 04:17:10 +0000 (17:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 14 Dec 2011 04:17:10 +0000 (17:17 +1300)

Trivial merge