Merge branch '2.5-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:47:13 +0000 (16:47 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:47:13 +0000 (16:47 +0200)
commitcff8e1cd5d325d175449476e1fad433e24ff6479
tree97f6fec5570e42f09c4a9f697e57f0dc977d96fc
parent44e1f567a621ecd697373c6c708e90c3171ec2b6
parentda8d68f1f9a6b0f70e493d706784ef9541857608
Merge branch '2.5-maintenance'
CHANGES