Merge branch '2.5-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:48:55 +0000 (16:48 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:48:55 +0000 (16:48 +0200)
commitbb09fb255f234f94d7bdd32ff011248de275af9a
tree5c902a435fc5951eb53c1869db0373992756e2ed
parentcff8e1cd5d325d175449476e1fad433e24ff6479
parent75cd04fd9876d46007ddcfaab77f922290ed1eca
Merge branch '2.5-maintenance'
CHANGES