| commit | cff8e1cd5d325d175449476e1fad433e24ff6479 | [log] [tgz] |
|---|---|---|
| author | Armin Ronacher <armin.ronacher@active-4.com> | Sun Oct 17 16:47:13 2010 +0200 |
| committer | Armin Ronacher <armin.ronacher@active-4.com> | Sun Oct 17 16:47:13 2010 +0200 |
| tree | 97f6fec5570e42f09c4a9f697e57f0dc977d96fc | |
| parent | 44e1f567a621ecd697373c6c708e90c3171ec2b6 [diff] | |
| parent | da8d68f1f9a6b0f70e493d706784ef9541857608 [diff] |
Merge branch '2.5-maintenance'