[SCM] smokeqt packaging branch, kde4.11, updated. debian/4.11.2-1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/smokeqt.git;a=commitdiff;h=f1af29f

The following commit has been merged in the kde4.11 branch:
commit f1af29f2aea1396f8b961640ff734c717e6ce739
Merge: 6d920170be0d7a6a5b448f9c0574524fa53b1e4b 0407e405191bef3e9380b9710cb73c41ad0f4e95
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Sep 28 17:21:44 2013 +0200

    Merge remote-tracking branch 'origin/master' into kde4.11
    
    Conflicts:
    	debian/changelog

 debian/changelog |    9 +++++++--
 debian/control   |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 27b3239,30c726f..d54bb70
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,16 @@@
 +smokeqt (4:4.11.1-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
-   [ Pino Toscano ]
++ -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Sep 2013 20:28:38 +0200
++
+ smokeqt (4:4.10.5-2) unstable; urgency=low
+ 
+   * Team upload.
    * Add the pkg-config build dependency.
+   * Fix Vcs-Git header.
  
-  -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Sep 2013 20:28:38 +0200
+  -- Pino Toscano <pino at debian.org>  Wed, 04 Sep 2013 16:52:33 +0200
  
  smokeqt (4:4.10.5-1) unstable; urgency=low
  

-- 
smokeqt packaging