Merge branch 'MDL-33022-master' of git://github.com/danpoltawski/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 7 Aug 2012 01:18:02 +0000 (09:18 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 7 Aug 2012 01:18:02 +0000 (09:18 +0800)

Trivial merge