commit | bb09fb255f234f94d7bdd32ff011248de275af9a | [log] [tgz] |
---|---|---|
author | Armin Ronacher <armin.ronacher@active-4.com> | Sun Oct 17 16:48:55 2010 +0200 |
committer | Armin Ronacher <armin.ronacher@active-4.com> | Sun Oct 17 16:48:55 2010 +0200 |
tree | 5c902a435fc5951eb53c1869db0373992756e2ed | |
parent | cff8e1cd5d325d175449476e1fad433e24ff6479 [diff] | |
parent | 75cd04fd9876d46007ddcfaab77f922290ed1eca [diff] |
Merge branch '2.5-maintenance'