Merge branch 'master_MDL-28493' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 04:02:52 +0000 (12:02 +0800)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 04:02:52 +0000 (12:02 +0800)

Trivial merge