Merge branch 'MDL-35510_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorAparup Banerjee <aparup@moodle.com>
Fri, 9 Nov 2012 06:11:42 +0000 (14:11 +0800)
committerAparup Banerjee <aparup@moodle.com>
Fri, 9 Nov 2012 06:11:42 +0000 (14:11 +0800)

Trivial merge