[SCM] muon packaging branch, kubuntu_vivid_backports, updated. 270b5144d153f58c7c5662a73ff5e1e62e9174a3

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/muon.git;a=commitdiff;h=270b514

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 270b5144d153f58c7c5662a73ff5e1e62e9174a3
Merge: e2e667aab17902ff5fd3c55329767e72a3e13406 436e54127bc1d86704d8fe418a6685792c1ff40a
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jun 4 03:26:57 2015 +0200

    merge

 debian/changelog                                       |  7 +++++++
 debian/patches/upstream_init-application-notifier.diff | 12 ++++++++++++
 2 files changed, 19 insertions(+)

diff --cc debian/changelog
index 0ecb41c,b8cd187..24c027e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,23 @@@
 +muon (4:5.3.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Plasma 5.3 beta
 +  * Add muon-notifier.mo
 +  * new upstream release
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +  * wrap-and-sort 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 27 May 2015 07:44:46 -0700
 +
+ muon (4:5.2.2-1-0ubuntu4.2) vivid; urgency=medium
+ 
+   * Add upstream_init-application-notifier.diff LP: #1461725 to initialise
+     the application notifier
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Jun 2015 02:42:46 +0200
+ 
  muon (4:5.2.2-1-0ubuntu4.1) vivid; urgency=medium
  
    * Add upstream_notifications.diff from upstream to prevent repeated

-- 
muon packaging