Merge branch 'separate-suse'
authorJoey Hess <joey@kitenet.net>
Wed, 4 Jan 2012 22:00:00 +0000 (18:00 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 4 Jan 2012 22:00:00 +0000 (18:00 -0400)
commite1a86ab9c70af8d852c4804dcb42b14bc5d0c19a
tree0c4ffce0dd42ed85211bcf9701191e9a053a5ae8
parentb7b0dd961716b24b8dd77a614b095734449ada5b
parentb8b6cc8fdae7358d184132b28d268e8d4dede25d
Merge branch 'separate-suse'

Conflicts:
debian/copyright
zgz/pit/suse-bzip2/blocksort.c