Merge remote-tracking branch 'schmonz/cvs'
authorJoey Hess <joey@kitenet.net>
Thu, 2 Feb 2012 05:11:45 +0000 (01:11 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 2 Feb 2012 05:11:45 +0000 (01:11 -0400)
commitbe1cf943a6995e744da0359ec5ad49b7260b690d
tree378add59d373791b0ef01aba970464e8ccbbd169
parentec2262603c94b85e75ba06ed60e2eeaf1325d59d
parenta65512ad188e28ef42f3aa7e6d887eb7dee09e48
Merge remote-tracking branch 'schmonz/cvs'