Merge branch 'wip-MDL-28615-master-squashed' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 5 Oct 2011 02:54:05 +0000 (10:54 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 5 Oct 2011 02:54:05 +0000 (10:54 +0800)

Trivial merge