Merge from alioth
authorPeter Palfrader <peter@palfrader.org>
Thu, 10 Jan 2008 13:50:58 +0000 (14:50 +0100)
committerPeter Palfrader <peter@palfrader.org>
Thu, 10 Jan 2008 13:50:58 +0000 (14:50 +0100)
1  2 
debian/changelog

Simple merge