[SCM] knotifications packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-gabfaf7d

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/knotifications.git;a=commitdiff;h=abfaf7d

The following commit has been merged in the kubuntu_unstable branch:
commit abfaf7d924473e976c6cb1f63dd8f5694573fc5d
Merge: d90a00f0f08eb29c4edeb025c38ba760c63f11d5 12b2f63ba5d123fd68c77a6a3e5d6b6f18fded75
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Jul 1 23:32:31 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog |  7 ++++++-
 debian/control   | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 71605b9,c933fc5..dea07a7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,12 +1,20 @@@
- knotifications (5.10.0-0ubuntu1) wily; urgency=medium
+ knotifications (5.11.0-1) unstable; urgency=medium
  
 +  [ Maximiliano Curia ]
    * New upstream release (5.10.0).
    * Update symbols files from buildds logs (5.9.0-1).
    * Update symbols files.
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 20:21:18 +0200
+ 
++knotifications (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:36:07 +0200
 +
  knotifications (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
knotifications packaging