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

Trivial merge