[SCM] kinit packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-7-g287889a

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 75608bd680160d2afbc63aefe7149001c079c756
Merge: c1c58e0814739288acc525652a7567899741079e 6d6228d285ad98cf764d4c34b7912742db54dacc
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 11:28:51 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

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

diff --cc debian/changelog
index 48508f4,94d8749..8c6d2e8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kinit (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:21:59 -0700
+ 
 +kinit (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.10.0).
 +  * New upstream release (5.11.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 10:19:51 +0200
 +
  kinit (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kinit packaging