Merge branch 'wip-MDL-27122-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 08:19:08 +0000 (16:19 +0800)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 08:19:08 +0000 (16:19 +0800)

Trivial merge