Merge branch 'MDL-30154_master_wip' of git://github.com/grabs/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 8 Nov 2011 03:15:01 +0000 (11:15 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 8 Nov 2011 03:15:01 +0000 (11:15 +0800)

Trivial merge