Merge remote branch 'intrigeri/po'
authorJoey Hess <joey@kitenet.net>
Sat, 25 Dec 2010 16:35:25 +0000 (12:35 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 25 Dec 2010 16:35:25 +0000 (12:35 -0400)
commitc5f1c503cdac65a55e6a796c86fdcc9d0b9ad6d3
treefe3bd9f4faa218f09d0ed53f3c69ef3e241360e3
parent64d4a4ab9c2ffe2d87fb604a431513d06c916aa2
parentb2a2246bac236cbe059042482828e68413597fd8
Merge remote branch 'intrigeri/po'