Merge branch 'MDL-36869-master' of git://github.com/FMCorz/moodle
authorAparup Banerjee <aparup@moodle.com>
Fri, 30 Nov 2012 07:05:41 +0000 (15:05 +0800)
committerAparup Banerjee <aparup@moodle.com>
Fri, 30 Nov 2012 07:05:41 +0000 (15:05 +0800)

Trivial merge