Merge branch 'MDL-35510_master' of git://github.com/lazydaisy/moodle
authorAparup Banerjee <aparup@moodle.com>
Fri, 9 Nov 2012 06:09:11 +0000 (14:09 +0800)
committerAparup Banerjee <aparup@moodle.com>
Fri, 9 Nov 2012 06:09:11 +0000 (14:09 +0800)

Trivial merge