Merge branch 'MDL-36305-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorAparup Banerjee <aparup@moodle.com>
Tue, 27 Nov 2012 03:53:09 +0000 (11:53 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 27 Nov 2012 03:53:09 +0000 (11:53 +0800)

Trivial merge