[SCM] kapidox packaging branch, master, updated. debian/5.37.0-2-85-gb2e06c9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f4792f0e3a73d74de039447b04f5c5c9eb162c04
Merge: e5b75a93bcc8f472aad5b192999ce3a938fb42b0 7ca969e48c4da7e4c968701db3ac28fd89ee0887
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Aug 3 12:24:50 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 5c57ddd,d3d41f4..7c54804
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,9 @@@
- kapidox (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
+ kapidox (5.12.0-0ubuntu1) wily; urgency=medium
  
    * New upstream release. 
 +  * Vivid backport. 
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Jul 2015 08:21:41 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 14:23:40 +0200
  
  kapidox (5.10.0-0ubuntu1) wily; urgency=medium
  

-- 
kapidox packaging