merged.
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 26 Jul 2009 08:35:04 +0000 (10:35 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 26 Jul 2009 08:35:04 +0000 (10:35 +0200)
commit3b336c88f8cbe60f84a28f55085f833fb7d0d72c
tree627f24a62b3ac3719a75d584b160cd89c89d142d
parenteaa1d64ad29e6f46b5095b14aac79ae79532ccd9
parent619eeed0d09e0a8347532dbfb27347f3b6d9eea7
merged.

--HG--
branch : trunk
CHANGES