diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2008-12-28 15:12:11 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2008-12-28 15:12:11 -0500 |
| commit | 17b2afe721d5b8fd2468fca56e91fe83bf49be64 (patch) | |
| tree | 3bcac2926d96743b98dfef87baf336247447b71e /debian | |
| parent | 25879952b1359bcd62dba33f2364c77442358832 (diff) | |
| parent | 82d94d4d4a8768e4d741bd37fc3b805260f775b1 (diff) | |
Merge branch 'master' into next
Conflicts:
debian/changelog
po/ikiwiki.pot
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 2a872bb0e..66db70288 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,7 +26,7 @@ ikiwiki (2.72) unstable; urgency=low * inline: Run format hook first, to ensure other format hooks can affect inlined content. Closes: #509710 - -- Joey Hess <joeyh@debian.org> Wed, 24 Dec 2008 19:49:32 -0500 + -- Joey Hess <joeyh@debian.org> Sun, 28 Dec 2008 15:01:02 -0500 ikiwiki (2.71) unstable; urgency=low |