Merge branch 'MDL-36912-master' of git://github.com/FMCorz/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 3 Dec 2012 07:54:52 +0000 (15:54 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 3 Dec 2012 07:54:52 +0000 (15:54 +0800)

Trivial merge