Merge commit 'jonas/master'
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 22 Jul 2009 22:37:22 +0000 (00:37 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 22 Jul 2009 22:37:22 +0000 (00:37 +0200)
commit44e72fab1db7e2a5b7419dea93a25793b27df951
treea524f1bc5c3afa4398e63ccda8e81d1944af5b31
parent88d4fb15ba997e41f92b8d51079be4e3c5783474
parent8229345b119803f9198c19d76af8e2b77f653a96
Merge commit 'jonas/master'