Merge branch 'wip-MDL-32108-master' of git://github.com/abgreeve/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 30 Aug 2012 03:37:47 +0000 (11:37 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 30 Aug 2012 03:37:47 +0000 (11:37 +0800)

Trivial merge