Merge remote-tracking branch 'schmonz/cvs'
authorJoey Hess <joey@kitenet.net>
Sat, 2 Feb 2013 23:39:25 +0000 (10:39 +1100)
committerJoey Hess <joey@kitenet.net>
Sat, 2 Feb 2013 23:39:25 +0000 (10:39 +1100)
commitc6d41f92283616b15233ade70d33f0919f995a44
tree305d6923dc44fd4f33f80cc5dbe87b508916bdac
parentc8270ad05c7b7183c1c5b71b8324363b6d40fe73
parenta5fb27acb86fbeaabd1ba24b6eecd2e41f986c9d
Merge remote-tracking branch 'schmonz/cvs'