Merge branch 'w35_MDL-34955_m24_tinycefinal' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 07:10:35 +0000 (15:10 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 07:10:35 +0000 (15:10 +0800)

Trivial merge