aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-07-01 15:36:42 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-07-01 15:36:42 -0500
commit699cfd922662beb924ac8e56220dc2e18f7459ff (patch)
treea0dceeea63de52d3cb4bc623a5971342772841d6
parentc96e42d1d00d68b6c858d7d314c13b4d05ca0d8b (diff)
parentc58fa92fbc37800d340d6eaacb13c4fd42df2857 (diff)
downloadayatana-indicator-session-699cfd922662beb924ac8e56220dc2e18f7459ff.tar.gz
ayatana-indicator-session-699cfd922662beb924ac8e56220dc2e18f7459ff.tar.bz2
ayatana-indicator-session-699cfd922662beb924ac8e56220dc2e18f7459ff.zip
sync with trunk to fix merge conflict
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ef1cd53..b04b591 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-session (12.10.5daily13.06.19-0ubuntu2) saucy; urgency=low
+
+ * Backport a fix for high resources usage issue, thanks Lars (lp: #1195595)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 01 Jul 2013 13:05:15 +0200
+
indicator-session (12.10.5daily13.06.19-0ubuntu1) saucy; urgency=low
[ Mathieu Trudel-Lapierre ]