Merge branch 'MDL-29995' of git://github.com/stronk7/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 23 Nov 2011 05:47:52 +0000 (13:47 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 23 Nov 2011 05:47:52 +0000 (13:47 +0800)

Trivial merge