summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-04-12 14:14:20 -0400
committerJoey Hess2014-04-12 14:14:20 -0400
commit9e9d0f1d410f806b546abed6055b25ac81f7042e (patch)
tree5a13b54820988c87f3567f90a1c5280763fc885e /debian
parent61ed9ef26c275ee8466e3d86b0a9b5ae275e3d4e (diff)
parentb3af5e44d0683033043511fefa3c5fc0ca2a4073 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c6ea2ebd..29f1787e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+propellor (0.3.1) UNRELEASED; urgency=medium
+
+ * Merge scheduler bug fix from git-annex.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 11 Apr 2014 15:00:11 -0400
+
propellor (0.3.0) unstable; urgency=medium
* ipv6to4: Ensure interface is brought up automatically on boot.