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

Conflicts:

	doc/bugs/attachment:_failed_to_get_filehandle.mdwn

diff --cc doc/bugs/attachment:_failed_to_get_filehandle.mdwn
index 09546dcb5edbf31afac2d47084309cf1d759945c,8bb9aadb9220a4168ec4b62ac2409d87987945e0..e2a9b483d4cab6b363e1e4f6e3ec8e85cf32898b
--- 1/doc/bugs/attachment:_failed_to_get_filehandle.mdwn
--- 2/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]]