Merge branch 'MDL-36710-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 27 Nov 2012 04:02:14 +0000 (12:02 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 27 Nov 2012 04:02:14 +0000 (12:02 +0800)

Trivial merge