Merge branch 'w46_MDL-21617_m22_xhack' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 21 Nov 2011 03:28:27 +0000 (11:28 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 21 Nov 2011 03:28:27 +0000 (11:28 +0800)

Trivial merge