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

diff --cc doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
index d926cebedb8978eaafe6138216418f1923a25e77,56b1b68306af2dd3abdb83078aadb9418c986e06..bb250eb42548af45f520d14c640da8da25595b27
--- 1/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
--- 2/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]]