merged.
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 26 Jul 2009 08:39:17 +0000 (10:39 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 26 Jul 2009 08:39:17 +0000 (10:39 +0200)
commit1b43b58e7af08570acd13a39af559a2ef2aeffb7
tree64b166f4f0a8de1685a6325d84938c0a5821ca2a
parent3b336c88f8cbe60f84a28f55085f833fb7d0d72c
parentc7e6c6d2e573804709ba4c01433860f785a865c7
merged.

--HG--
branch : trunk