diff options
| author | Joey Hess <joey@kitenet.net> | 2011-02-25 14:56:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-02-25 14:56:16 -0400 |
| commit | cc5f8de9e89c0028c94974a6b81f17f0628e9888 (patch) | |
| tree | 69e35c308e77fa97334a3a338b469d5bdb725e66 /doc/users | |
| parent | 5d6a455367d563881f87b8157294565aaf20109c (diff) | |
| parent | 93f963abd05900306823dc165baa339b8c5106b1 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc/users')
| -rw-r--r-- | doc/users/fmarier.mdwn | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/users/fmarier.mdwn b/doc/users/fmarier.mdwn new file mode 100644 index 000000000..ecf342697 --- /dev/null +++ b/doc/users/fmarier.mdwn @@ -0,0 +1,6 @@ +# François Marier + +Free Software and Debian Developer. Lead developer of [Libravatar](http://www.libravatar.org) + +* [Blog](http://feeding.cloud.geek.nz) +* [Identica](http://identi.ca/fmarier) / [Twitter](http://twitter.com/fmarier) |