summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-01-15 14:03:50 -0400
committerJoey Hess2015-01-15 14:03:50 -0400
commit47fdb99fbba21f724a2cb6e909c3801e3cc7ab22 (patch)
tree6b97363e81def50d20a1e5aefb6a2a2519bfdcfa /debian
parent16031a7c26464485e7c11afdec7d0b80dfe2f5bf (diff)
parent35cd06e4e6cad5bc6c9bbbd33642450dbd2de10c (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
1 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index c54aa167..44335711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-propellor (1.3.2) UNRELEASED; urgency=medium
+propellor (1.3.2) unstable; urgency=medium
* SSHFP records are also generated for CNAMES of hosts.
+ * Merge Utiity modules from git-annex.
+ * Ignore bogus DNS when spinning the local host.
- -- Joey Hess <id@joeyh.name> Sun, 04 Jan 2015 21:25:42 -0400
+ -- Joey Hess <id@joeyh.name> Thu, 15 Jan 2015 14:02:07 -0400
propellor (1.3.1) unstable; urgency=medium