diff options
| author | Joey Hess <joey@kitenet.net> | 2010-08-15 12:01:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-08-15 12:01:16 -0400 |
| commit | 91f5697025ce92e64ad9d02c122d6a8d6df22278 (patch) | |
| tree | a850b59804e6702e1b21521690fc8803c64a9e21 /debian | |
| parent | 522c88c2771177ca0074397f8d675bcecaa4f9de (diff) | |
| parent | 77aaf95d5d72149b31900048ee8ef4125ffa5548 (diff) | |
Merge branch 'debian-testing'
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 121cf8381..b9b08050b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ ikiwiki (3.20100815) unstable; urgency=medium * Fix po test suite to not assume ikiwiki's underlay is already installed. Closes: #593047 - -- Joey Hess <joeyh@debian.org> Sun, 15 Aug 2010 11:45:40 -0400 + -- Joey Hess <joeyh@debian.org> Sun, 15 Aug 2010 11:42:55 -0400 ikiwiki (3.20100804) unstable; urgency=low |