From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 8 Jul 2008 22:12:33 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.53~27
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/03d7f84f28aaac46bd7cfc616a995402e89cc4cc

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

Conflicts:

	doc/bugs/attachment:_failed_to_get_filehandle.mdwn
---

03d7f84f28aaac46bd7cfc616a995402e89cc4cc
diff --cc doc/bugs/attachment:_failed_to_get_filehandle.mdwn
index 09546dcb5,8bb9aadb9..e2a9b483d
--- a/doc/bugs/attachment:_failed_to_get_filehandle.mdwn
+++ b/doc/bugs/attachment:_failed_to_get_filehandle.mdwn
@@@ -97,6 -102,4 +102,8 @@@ Is it Ikiwiki bug or my attachment plug
  > I've reproduced the bug, and it does seem to be a bug with the perl in
  > debian stable/ubuntu hardy. Trying to figure it out --[[Joey]]
  
 +> This was amazingly disgusting, see commit message for the full horror of
 +> the details. I think it's [[done]] -- at least it works on debian stable
 +> now. --[[Joey]]
++
+ >> Thank you very much for your effort, Joey! :) --[[Paweł|ptecza]]