summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-12-19 17:49:33 -0400
committerJoey Hess2015-12-19 17:49:33 -0400
commit55edd0346efa365e12a33d02d7ca37236485f3ce (patch)
tree6a0a2453494e4c75836fbff9c48ea206b0451545 /debian
parente528dd7f7b6c2bfa8fc3eed26a4f981e201ac32e (diff)
parent97447cf9d1202d023a2ac2d3cc693dacfc266e2f (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d31f781b..75a00e10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ propellor (2.15.1) unstable; urgency=medium
Thanks, FĂ©lix Sipma.
* Merged Utility changes from git-annex.
* Clean build with ghc 7.10.
+ * Merged Utility changes from git-annex.
-- Joey Hess <id@joeyh.name> Sat, 19 Dec 2015 16:43:09 -0400