Merge branch 'MDL-28490' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 09:55:21 +0000 (17:55 +0800)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 09:55:21 +0000 (17:55 +0800)

Trivial merge