From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 9 Jun 2009 01:41:31 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.141~17
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f57672f66379c84cd37b9c5a581788aefbb34358?ds=inline;hp=-c

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

Conflicts:
	doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
---

f57672f66379c84cd37b9c5a581788aefbb34358
diff --combined doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
index d926cebed,56b1b6830..bb250eb42
--- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
+++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
@@@ -57,9 -57,8 +57,12 @@@ Thanks Joey. --[Mick](http://www.lunix.
  >> fails half the time, and succeeds half the time;
  >> seems to be picking openid1 and openid2 randomly and failing
  >> on the latter. I have emailed Evan Prodromou about this weird behavior.
-->> Not clear to me if identi.ca or certifi.ca is at failt,
++>> Not clear to me if identi.ca or certifi.ca is at fault,
  >> but luckily he runs both..
  >> --[[Joey]] 
 +
+ Ahh so it's not just me.  
+ It's handy having contacts in the _right_ places.  --[Mick](http://www.lunix.com.au)
++
 +>> ikiwiki's next release will allow adding 'delegate=1' to the 
 +>> meta directive to only delegate to openid1. --[[Joey]]