Merge branch 'MDL-36841_master' of git://github.com/markn86/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 27 Nov 2012 06:56:03 +0000 (14:56 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 27 Nov 2012 06:56:03 +0000 (14:56 +0800)

Trivial merge