Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 31 Oct 2011 06:13:46 +0000 (14:13 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 31 Oct 2011 06:13:46 +0000 (14:13 +0800)

Trivial merge