Merge branch 'MDL-35587_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
authorAparup Banerjee <aparup@moodle.com>
Tue, 9 Oct 2012 08:28:49 +0000 (16:28 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 9 Oct 2012 08:28:49 +0000 (16:28 +0800)

Trivial merge