[SCM] muon packaging branch, master, updated. debian/5.3.2-1-6-g194a97e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 1e2ee3e3cd19e543ee31683bf38b800afebfff7e
Merge: 1d88b0e729663abf43db485d65680eaf5a2877e5 a3435a7bbcfebb3a81ee6270a5bb15618e4ec213
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jul 10 10:19:05 2015 +0200

    Merge tag 'ubuntu/4%5.3.2-0ubuntu1'
    
    'muon Ubuntu release 4:5.3.2-0ubuntu1'
    
    Conflicts:
    	debian/changelog

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index a1440d7,864a947..bf68d44
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
 +muon (4:5.3.2-1) unstable; urgency=medium
 +
 +  * New upstream release (5.3.2).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 23:04:58 +0200
 +
+ muon (4:5.3.2-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:32:50 +0000
+ 
  muon (4:5.3.1-0ubuntu1) wily; urgency=medium
  
    [ Jonathan Riddell ]

-- 
muon packaging