summaryrefslogtreecommitdiff
path: root/packaging/debian
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-03-22 19:57:35 -0400
committerMicah Anderson <micah@riseup.net>2009-03-22 19:57:35 -0400
commitabd2c7a17b57d7b802353c851c2150b07824a3a5 (patch)
treeb68855b2f19be7928459e4dc48bdf1b9aef95a5c /packaging/debian
parenta6603e05c8067efca6197ec435696c1a45bcc517 (diff)
parent45d416f40d4a300b71a83f67b1324dd8744d4b3a (diff)
Merge commit 'jrollins/master'
Conflicts: website/download.mdwn
Diffstat (limited to 'packaging/debian')
-rw-r--r--packaging/debian/changelog4
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 70fef9f..16e7f21 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,11 +1,11 @@
monkeysphere (0.25-1~pre) UNRELEASED; urgency=low
* New upstream release:
- - fix the marginal ui output so that it's not prefixed by the LOG_PREFIX
+ - update/fix the marginal ui output
- use msmktempdir everywhere (avoid unwrapped calls to mktemp for
portability)
- -- Jameson Graef Rollins <jrollins@finestructure.net> Sat, 07 Mar 2009 12:28:13 -0500
+ -- Jameson Graef Rollins <jrollins@finestructure.net> Wed, 18 Mar 2009 11:46:44 -0400
monkeysphere (0.24-1) unstable; urgency=low