Merged
authorArmin Ronacher <armin.ronacher@active-4.com>
Mon, 4 May 2009 06:39:23 +0000 (08:39 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Mon, 4 May 2009 06:39:23 +0000 (08:39 +0200)
commitd1442c858407b630b0c2dd5c780ed44ab6f96728
tree423c4ec86c5dc3611610fc1a5f10502b954e1698
parentf49f8f7532cd7ef144f6ef8b663ccf313e041776
parenta092a786444bb285045737e4d782fc7a80233944
Merged

--HG--
branch : trunk