[SCM] kaccounts-providers packaging branch, kubuntu_stable, updated. 87df0ae45f47f9102dd66e1b731533c4aea0d18f

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kaccounts-providers.git;a=commitdiff;h=bde1e0e

The following commit has been merged in the kubuntu_stable branch:
commit bde1e0e90031342aee2de6cd8c68237874defc2b
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri May 15 13:49:12 2015 -0700

    Epic merge fail. Skip 15.04.0? I give up.
---
 debian/changelog | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5e3fa2..fbbc229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,9 @@
 kaccounts-providers (15.04.1-0ubuntu1) UNRELEASED; urgency=medium
 
-  * New upstream release.
-
- -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 15 May 2015 13:46:24 -0700
-
-kaccounts-providers (15.04.0-0ubuntu1) UNRELEASED; urgency=medium
-
+  [ Harald Sitter ]
   * Initial release.
 
- -- Harald Sitter <apachelogger at kubuntu.org>  Tue, 09 Dec 2014 14:13:07 +0100
+  [ Scarlett Clark ]
+  * Epic merge fail. Skip 15.04.0? I give up. 
 
+ -- Harald Sitter <apachelogger at kubuntu.org>  Tue, 09 Dec 2014 14:13:07 +0100

-- 
kaccounts-providers packaging