Merge branch 'wip-MDL-34075-master' of git://github.com/abgreeve/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 29 Aug 2012 04:38:17 +0000 (12:38 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 29 Aug 2012 04:38:17 +0000 (12:38 +0800)

Trivial merge