Merge branch 'MDL-30135' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 8 Nov 2011 03:43:49 +0000 (11:43 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 8 Nov 2011 03:43:49 +0000 (11:43 +0800)

Trivial merge