Merge branch 'MDL-35010_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
authorAparup Banerjee <aparup@moodle.com>
Thu, 30 Aug 2012 02:43:38 +0000 (10:43 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 30 Aug 2012 02:43:38 +0000 (10:43 +0800)

Trivial merge