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)
commitd1e82ba966124aefce9f45b053b03e8cf717ff2b
tree44f3bd9c0d4f8518c1330399ea217ac1cc53c6fc
parentc84f4700ec3ba6207ead924231c5ca4b918d14d7
parent63017358c5c00c7a6b97b312135761c82372fc2c
Merge branch 'w43_MDL-29922_m22_smarty' of git://github.com/skodak/moodle