merged
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 7 Oct 2007 16:54:45 +0000 (18:54 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 7 Oct 2007 16:54:45 +0000 (18:54 +0200)
commit46d9bebc25bb312fcb0717e24bb7dbf3a4beed04
tree347f70693b74f8bd41a8bcf92bacec157849dd85
parent0949e4dd3ca92975b89b42329c5188a7cde18f78
parente3ec72c4b237085efc1795f0c64a7e80b9a490c7
merged

--HG--
branch : trunk