Merge branch 'MDL-25695-master' of https://github.com/mackensen/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 15 May 2012 03:03:07 +0000 (11:03 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 15 May 2012 03:03:07 +0000 (11:03 +0800)

Trivial merge