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

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 87df0ae45f47f9102dd66e1b731533c4aea0d18f
Merge: 08a136269a5d698679eacd16b8cafd454c8de013 eed15ca3dbd848429d22c2bec0f427b56054201d
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri May 15 14:21:30 2015 -0700

    Manual merge.

 debian/changelog | 1 +
 debian/control   | 1 +
 2 files changed, 2 insertions(+)

diff --cc debian/changelog
index 5f37475,e001150..63c1c69
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,3 +1,10 @@@
 +kaccounts-providers (15.04.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
++  * Manual merge. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 15 May 2015 14:18:04 -0700
 +
  kaccounts-providers (15.04.0-0ubuntu1) UNRELEASED; urgency=medium
  
    * Initial release.

-- 
kaccounts-providers packaging