[Pkg-cli-apps-commits] [SCM] sparkleshare branch, ubuntu, updated. debian/0.6.0-1ubuntu1

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 683a8451d03641d8d40e9ed915045c7a567f51a0
Author: Iain Lane <laney at debian.org>
Date:   Sat Jan 14 09:21:16 2012 +0000

    Update & finalise changelog for merge
    
    Git-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index 2011853..e11a2d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sparkleshare (0.6.0-1ubuntu1) precise; urgency=low
+
+  * Merge with Debian experimental, remaining changes:
+    + Add gbp.conf for Ubuntu branch.  Ubuntu sources are stored as a branch
+    in Debian's git repository. Please try to use this if possible (contact
+    the Debian maintainers for merges).
+    + Add BD on libappindicator# to enable app indicator support
+
+ -- Iain Lane <laney at ubuntu.com>  Sat, 14 Jan 2012 09:20:47 +0000
+
 sparkleshare (0.6.0-1) unstable; urgency=low
 
   [ Carlos Martín Nieto ]

-- 
sparkleshare