Merge branch 'wip-MDL-17327-master-v2' of git://github.com/abgreeve/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 21 Mar 2012 02:02:18 +0000 (10:02 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 21 Mar 2012 02:02:18 +0000 (10:02 +0800)

Trivial merge