Merge branch 'w43_MDL-29922_m22_smarty' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 31 Oct 2011 09:19:14 +0000 (17:19 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 31 Oct 2011 09:19:14 +0000 (17:19 +0800)

Trivial merge