| commit | 64ff4fa4f5110358f0fea236c600a13dc00c7909 | [log] [tgz] |
|---|---|---|
| author | Armin Ronacher <armin.ronacher@active-4.com> | Mon Oct 18 14:38:39 2010 +0200 |
| committer | Armin Ronacher <armin.ronacher@active-4.com> | Mon Oct 18 14:38:39 2010 +0200 |
| tree | 831a6e7f690a443680c8109dcfc29bc8adc36f41 | |
| parent | bb09fb255f234f94d7bdd32ff011248de275af9a [diff] | |
| parent | 1116573c1159abb18e36ea96d8fbbde3cad23974 [diff] |
Merge branch '2.5-maintenance' Conflicts: CHANGES setup.py