Merge branch 'master' into po
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 22:52:32 +0000 (17:52 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 22:52:32 +0000 (17:52 -0500)
commit2a56ec664402e21625e9251dcbb3b53490e7ed0d
treea3b8ca059cd5b671721b071f4d30786a389d7196
parentf6db9205369d1197bbd05f3e07ed79393b5fe220
parentd1b22b252481134815b1d02d564b6b9622fe7b4b
Merge branch 'master' into po