Merge branch 'MDL-35089' of git://github.com/stronk7/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 5 Sep 2012 07:02:17 +0000 (15:02 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 5 Sep 2012 07:02:17 +0000 (15:02 +0800)

Trivial merge