Merge branch 'ch/new_version'
authorChristian Hofstaedtler <ch@grml.org>
Sun, 24 Jul 2011 21:38:21 +0000 (23:38 +0200)
committerChristian Hofstaedtler <ch@grml.org>
Sun, 24 Jul 2011 21:50:48 +0000 (23:50 +0200)
commitbcb17b6d4411efd067d5704e0c318e029f6448d3
treeb01480e136be3597e4aab5440d4e21a390ddbf88
parent79a3a56c3458d79a855d78daa1e82ef582202aab
parenta06109b61c125129e45b0fde2bf7b1d61865735b
Merge branch 'ch/new_version'

Conflicts:
Makefile
31_package_rename.patch
Makefile
debian/patches/31_package_rename.patch