merge

63aaa27a · Christopher R. Gabriel · bb94405b · 63aaa27a
Commit 63aaa27a authored Nov 21, 2016 by Christopher R. Gabriel
--- a/debian/changelog
+++ b/debian/changelog
@@ -145,7 +145,6 @@ fuss-client (4.0-1) jaunty; urgency=low
  * Initial jaunty port

 -- Christopher R. Gabriel <cgabriel@truelite.it>  Mon, 11 May 2009 18:23:52 +0200
->>>>>>> precise

 fuss-client (2.1.1-1) hardy; urgency=low