[SCM] kcalutils packaging branch, kubuntu_unstable, updated. debian/15.08.1-1-32-g5be8590

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kcalutils.git;a=commitdiff;h=5be8590

The following commit has been merged in the kubuntu_unstable branch:
commit 5be8590b148bbaa9634a39ae0f4759901180b03b
Merge: 55bf8b7051e16872494489efe092732a4c7ffbda 920149dace7df83b44a9c8d2d1558d03b3175f0c
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 4 17:04:49 2016 -0800

     * Refreshing symbols and removing merge marker  * Fixing symbols file
    
     * Refreshing symbols and removing merge marker
     * Fixing symbols file

 debian/changelog                    |   7 ++
 debian/libkf5calendarutils5.symbols | 141 ++++++++++++++++++------------------
 2 files changed, 77 insertions(+), 71 deletions(-)

diff --cc debian/changelog
index 0fa0942,1d1f059..21180bc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -18,8 -17,11 +18,15 @@@ kcalutils (4:15.12.1-0ubuntu1) UNRELEAS
  
    [ Scarlett Clark ]
    * Fix merge. 
 +  * Fix merger. 
  
+   [ Clive Johnston ]
+   * Refreshing symbols and removing merge marker 
+   * Fixing symbols file
+ 
++  [ Scarlett Clark ]
++  * Fun with mergers. Weeeee. 
++
   -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 29 Jan 2016 13:22:09 -0800
  
  kcalutils (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium

-- 
kcalutils packaging