[SCM] kpeople packaging branch, master, updated. debian/5.37.0-2-69-g7686ba4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7c5f03e99042b2cc179a0b73cd7637b3f4ba33a1
Merge: e6d29c5022f874afc68d3c9e38a97ad1e2852317 71a267ae1eb7e78099ea8f5812703f44104b5fe8
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Aug 3 14:08:44 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 8366082,477f4d6..cedc64b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,9 -2,8 +2,9 @@@ kpeople (5.12.0-0ubuntu1) wily; urgency
  
    * New upstream release
    * Fix merge.
 +  * Vivid backport. 
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:20:49 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 16:07:43 +0200
  
  kpeople (5.11.0-1) unstable; urgency=medium
  

-- 
kpeople packaging