Merge branch '2.5-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:42:32 +0000 (16:42 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:42:32 +0000 (16:42 +0200)
commit99d70bd309921af81aae8849556ffdcbabd99556
tree211676b0775c4ff87a5102ea1ef7b4e1bda23f59
parente5babe89ddec519bc77bb176d71f18e7da372530
parente104f3022ef5dbba8e7127749dfb8ea83e10df87
Merge branch '2.5-maintenance'