Merge commit 'upstream/master' into prv/po

[ikiwiki] / doc / users / Edward_Betts.mdwn

My watchlist:

[[!inline archive="yes" sort="mtime" atom="yes" pages="
todo/allow_wiki_syntax_in_commit_messages*
todo/shortcut_with_different_link_text*
todo/structured_page_data*
tips/convert_mediawiki_to_ikiwiki*
"]]