summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-12-15 21:09:50 -0400
committerJoey Hess2015-12-15 21:09:50 -0400
commit4d12d728dd1ef087af39de142c0c5422495305b9 (patch)
tree9a28e835a5e7417da1fa674753fb420a26edd9e4 /debian
parent81f35a5f8df6907dba394b028d2c7bcbf18cdc5f (diff)
parent47a2b72bed3770d3dfb26c4142479c436a11ce55 (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 d7f29c31..d9e9bead 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ propellor (2.15.1) UNRELEASED; urgency=medium
Thanks, Sean Whitton.
* Added User.systemAccountFor and User.systemAccountFor' properties.
Thanks, FĂ©lix Sipma.
+ * Merged Utility changes from git-annex.
-- Joey Hess <id@joeyh.name> Tue, 08 Dec 2015 11:59:43 -0400