Merge branch 'MDL-30655-master' of git://github.com/sammarshallou/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 05:20:21 +0000 (13:20 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 05:20:21 +0000 (13:20 +0800)

Trivial merge