Merge branch 'MDL-33694' of git://github.com/danpoltawski/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 25 Jun 2012 08:45:23 +0000 (16:45 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 25 Jun 2012 08:45:23 +0000 (16:45 +0800)

Trivial merge