Merge branch 'MDL-30646' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Dec 2011 00:23:45 +0000 (13:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Dec 2011 00:23:45 +0000 (13:23 +1300)

Trivial merge