Merge remote branch 'intrigeri/po'
authorJoey Hess <joey@kitenet.net>
Sat, 24 Jul 2010 09:22:33 +0000 (05:22 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 24 Jul 2010 09:22:33 +0000 (05:22 -0400)
1  2 
t/po.t

diff --cc t/po.t
Simple merge