Merge branch 'wip-mdl-36767-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorAparup Banerjee <aparup@moodle.com>
Tue, 27 Nov 2012 04:20:25 +0000 (12:20 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 27 Nov 2012 04:20:25 +0000 (12:20 +0800)

Trivial merge