Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

diff --git a/debian/changelog b/debian/changelog
index 48415fa67652352d909bd4e77e16b4d1e850ead1..46fcf37dd4e87e4ff9dbdf65e5ea1e7dd1875f0f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (2.30) UNRELEASED; urgency=low
+ikiwiki (2.30) unstable; urgency=low
 
   [ Joey Hess ]
   * Old versions of git-init don't support --git-dir or GIT_DIR with
@@ -40,7 +40,7 @@ ikiwiki (2.30) UNRELEASED; urgency=low
     his independent work on bzr support.
   * Copyright file updates.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 11 Jan 2008 15:09:37 -0500
+ -- Joey Hess <joeyh@debian.org>  Sat, 02 Feb 2008 17:41:57 -0500
 
 ikiwiki (2.20) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index d63adbc1c1b7d22ec1c90a49c4241b7f16d569d0..e2804b413fde2fda88cef7aab45736b1ef7a9b46 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Description: a wiki compiler
  ikiwiki implements all of the other standard features of a wiki, including
  web-based page editing, user registration and logins, a RecentChanges
  page, BackLinks, search, Discussion pages, tags, smart merging and conflict
- resolution, page locking, and commit emails.
+ resolution, and page locking.
  .
  ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
  ikiwiki provides a plugin system which allows many other features to be