Merge branch 'MDL-36841_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
authorAparup Banerjee <aparup@moodle.com>
Tue, 27 Nov 2012 06:56:36 +0000 (14:56 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 27 Nov 2012 06:56:36 +0000 (14:56 +0800)

Trivial merge