merge
authorfp <fp@fp-laptop>
Sat, 17 Sep 2011 16:28:41 +0000 (18:28 +0200)
committerfp <fp@fp-laptop>
Sat, 17 Sep 2011 16:28:41 +0000 (18:28 +0200)
commit8aff076c34f0b25a961e6973a322f1a569368d32
tree3727fe3896c2f7bef17e149f5a0a7d5cddd81cf5
parent8ffc7eb7730d89d7d2f37002fcd55bb78b3b09cc
parentff1e3e7351b9fb1a732e63e9775ab9c0ddef6d95
merge

bzr revid: fp@fp-laptop-20110917162841-j6prs22ohjv8tewt
addons/mrp/mrp.py