Merge remote branch 'upstream/master' into prv/po
[ikiwiki.git] / underlays / basewiki / ikiwiki / openid.mdwn
2007-12-08 Joey HessMAJOR basewiki reorg