Merge branch 'MDL-31959_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorAparup Banerjee <aparup@moodle.com>
Wed, 29 Aug 2012 07:33:43 +0000 (15:33 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 29 Aug 2012 07:33:43 +0000 (15:33 +0800)

Trivial merge