[SCM] kidletime packaging branch, master, updated. debian/5.37.0-2-86-g062b4e5

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4041c5feded15daba9c1386a17ffac4ede673f26
Merge: 51ead096725d1dee887ee7efc7a5e6db09271075 578ae4df884d87daeda9150baa930b39e6ab6887
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Aug 3 12:32:49 2015 +0000

    Merging remotes/origin/kubuntu_wily_archive into kubuntu_unstable.

 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index b63035d,8fcdf8e..27e8480
--- a/debian/changelog
+++ b/debian/changelog
@@@ -10,10 -10,7 +10,10 @@@ kidletime (5.12.0-0ubuntu1) wily; urgen
    [ José Manuel Santamaría Lema ]
    * Update installed files.
  
 +  [ Scarlett Clark ]
 +  * Vivid backport. 
 +
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:11:35 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 14:31:20 +0200
  
  kidletime (5.11.0-1) unstable; urgency=medium
  

-- 
kidletime packaging