Merge remote-tracking branch 'origin/master'
[ikiwiki] / doc / users / Stefano_Zacchiroli.mdwn
1 <http://upsilon.cc/~zack>