Merge branch 'master' of ssh://git.ikiwiki.info
[ikiwiki] / doc / users / tbm.mdwn
2012-03-26  http://tbm.myopeni... add user page for Martin Michlmayr