[SCM] kinit packaging branch, master, updated. cfd7ed81f94d962d8e590d520475a1c4c088f327

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7e71c5719ed8e207eda9952f4057362f05482ece
Merge: 419395b2fcf59305dd134a8171a6c8e75ef6f8fe 23f4b60ab86aa810198b15f39ff8535d6666d00d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:31:27 2015 +0200

    Merge commit '23f4b60ab86aa810198b15f39ff8535d6666d00d'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index be549ad,90722a0..61d4294
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +kinit (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:25:32 +0200
 +
+ kinit (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:19:56 +0200
+ 
 +kinit (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:59 +0100
 +
+ kinit (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:46:21 +0100
+ 
 +kinit (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:51 +0100
 +
  kinit (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kinit packaging