Merge remote-tracking branch 'intrigeri/po'
authorJoey Hess <joey@kitenet.net>
Tue, 19 Jul 2011 18:11:36 +0000 (14:11 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 19 Jul 2011 18:11:36 +0000 (14:11 -0400)
commit8512ae3ed5329a8aa69debc96f49eaa6dedeaae0
tree94d25bdf3f15f4838c0b3f90eab3a5b2b595dd02
parent5eb8369924959d184717e87c9d35f04c0e41fe22
parent739554622fa1caa6bcc0474ebbdcd9db3627389d
Merge remote-tracking branch 'intrigeri/po'