Merge branch 'MDL-34952_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE
authorAparup Banerjee <aparup@moodle.com>
Wed, 29 Aug 2012 05:27:05 +0000 (13:27 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 29 Aug 2012 05:27:05 +0000 (13:27 +0800)

Trivial merge