Merge branch '2.5-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Mon, 18 Oct 2010 12:38:39 +0000 (14:38 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Mon, 18 Oct 2010 12:38:39 +0000 (14:38 +0200)
commit64ff4fa4f5110358f0fea236c600a13dc00c7909
tree831a6e7f690a443680c8109dcfc29bc8adc36f41
parentbb09fb255f234f94d7bdd32ff011248de275af9a
parent1116573c1159abb18e36ea96d8fbbde3cad23974
Merge branch '2.5-maintenance'

Conflicts:
CHANGES
setup.py
CHANGES