Merge remote branch 'intrigeri/po'
authorJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 18:47:57 +0000 (14:47 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 18:47:57 +0000 (14:47 -0400)
commit931036eb5c2a26dd0f4bae1c6d9003b65ad890ff
treee96deb0f0094ebdb77469bb4e30405f02d4c7867
parent67ac2bad74e42cb3dec564fb40a198688b2e358e
parente85c15e75bc7a24be537d905a53877f462c2d8cd
Merge remote branch 'intrigeri/po'