Merge branch 'wip-mdl-36707-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorAparup Banerjee <aparup@moodle.com>
Tue, 20 Nov 2012 08:28:00 +0000 (16:28 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 20 Nov 2012 08:28:00 +0000 (16:28 +0800)

Trivial merge