Merged 2.3.1 in
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 18 Feb 2010 23:01:18 +0000 (00:01 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 18 Feb 2010 23:01:18 +0000 (00:01 +0100)
commit9722bf722e804b38600ba0044a3009097bd26bd2
tree354d98b4a2ec2b7547c796760768674172e46812
parent9164d04a5d826c8c9a8e8c36a1c4457d5b10a47e
parent2ae59b28374337b2fd97c7b21b82c58c6a04a257
Merged 2.3.1 in

--HG--
branch : trunk
.hgtags