summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-10-21 19:49:15 -0400
committerJoey Hess2015-10-21 19:49:15 -0400
commit8102ce74d3460de069acf2209988a08781b26c39 (patch)
tree6d41ef94daf3dc07a768e7c954ff884775d1a87c
parenteac925f398df39791fe8236f8f8329627761f2e9 (diff)
parent744c0362b22c9f05de44dc8b4e1ec81b63cb1882 (diff)
Merge branch 'joeyconfig'
-rw-r--r--debian/changelog4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b4819dd7..49c866bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-propellor (2.11.0) UNRELEASED; urgency=medium
+propellor (2.11.0) unstable; urgency=medium
* Rewrote Propellor.Property.ControlHeir one more time, renaming it to
Propellor.Property.Conductor.
* Added Ssh properties to remove authorized_keys and known_hosts lines.
- -- Joey Hess <id@joeyh.name> Wed, 21 Oct 2015 15:06:26 -0400
+ -- Joey Hess <id@joeyh.name> Wed, 21 Oct 2015 19:49:00 -0400
propellor (2.10.0) unstable; urgency=medium