Commit 63aaa27a authored by Christopher R. Gabriel's avatar Christopher R. Gabriel
Browse files

merge

parent bb94405b
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment