merged with 2.3-maintenance
authorArmin Ronacher <armin.ronacher@active-4.com>
Fri, 19 Feb 2010 10:10:32 +0000 (11:10 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Fri, 19 Feb 2010 10:10:32 +0000 (11:10 +0100)
commit8986f47be487eabde1e416834bcc96f3a78ae617
treed1f0427db9f3ec0c6e6eb236130c5ff1a61f988f
parent9722bf722e804b38600ba0044a3009097bd26bd2
parent549f6b515e0435866db1e40a48225088be03f584
merged with 2.3-maintenance

--HG--
branch : trunk
CHANGES