[Pkg-cli-apps-commits] [SCM] smuxi branch, lucid-backports, updated. debian/0.7.2.1-2.lucid+1-5-g99cdee5

[Mirco Bauer]

The following commit has been merged in the lucid-backports branch:
commit 09a0d8145cb84edc7bf0d1712f6566c3b6150509
Merge: 5c471498b7a8b303aa15f074435856c736100b7c 8e6bf6b5e771e87639df24edec2478335ea498df
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed Jul 28 04:37:32 2010 +0200

    Merge branch 'master' into lucid-backports
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index bb018e9,41a5f09..3eb6c05
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +smuxi (0.7.2.1-2~lucid+1) lucid; urgency=low
 +
 +  * Rebuild for lucid-ppa.
 +
 + -- Mirco Bauer <meebey at debian.org>  Sat, 24 Jul 2010 11:41:30 +0200
 +
+ smuxi (0.7.2.2-1) unstable; urgency=low
+ 
+   * [37b22cb] Imported Upstream version 0.7.2.2
+ 
+  -- Mirco Bauer <meebey at debian.org>  Wed, 28 Jul 2010 03:44:36 +0200
+ 
  smuxi (0.7.2.1-2) unstable; urgency=low
  
    * [732a021] Updated ubuntu_default_settings patch to cleanly apply

-- 
smuxi