From 0d92055b64192ccd444e026d4d627ad604c87d2f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 22 Jul 2009 17:28:06 +0200
Subject: [PATCH 1/2] remove ion

---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 56f407a41..72bdbf3d8 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -3,7 +3,6 @@ Projects & Organizations
 
 * [This wiki](http://ikiwiki.info) (of course!)
 * [Planet Debian upstream](http://updo.debian.net/)
-* The [ion window manager homepage](http://modeemi.fi/~tuomov/ion/)
 * [Debian Mentors wiki](http://jameswestby.net/mentors/)
 * The [Sparse wiki](http://kernel.org/pub/linux/kernel/people/josh/sparse).
 * [The BSD Associate Admin Book Project](http://bsdwiki.reedmedia.net/)

From 88d4fb15ba997e41f92b8d51079be4e3c5783474 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 22 Jul 2009 17:48:49 +0200
Subject: [PATCH 2/2] add --previous at bubulle's suggestion

---
 IkiWiki/Plugin/po.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 193cf0a54..8f169fda5 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -828,7 +828,7 @@ sub refreshpofiles ($@) {
 	foreach my $pofile (@pofiles) {
 		IkiWiki::prep_writefile(basename($pofile),dirname($pofile));
 		if (-e $pofile) {
-			system("msgmerge", "-q", "-U", "--backup=none", $pofile, $potfile) == 0
+			system("msgmerge", "--previous", "-q", "-U", "--backup=none", $pofile, $potfile) == 0
 				or error("po(refreshpofiles) ".
 					 sprintf(gettext("failed to update %s"),
 						 $pofile));