Merge branch '2.5-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:04:26 +0000 (16:04 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:04:26 +0000 (16:04 +0200)
commit91f7fefbcbfc676a2a97b7aa6d71fbeeadada606
treec7bb5dcaf6fdbf0b63bf61d00b5412dd2262e5e9
parentf2cd943c03f2503ca71c4841a542791391cc6eae
parenta0cc246dff77ddafe537ba1a6d31d92a7f08c47c
Merge branch '2.5-maintenance'