summaryrefslogtreecommitdiff
path: root/doc/users/fmarier.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-04-04 13:35:18 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-04-04 13:35:18 -0400
commit88b0f2c9987fa0fd8708a4b7c4080a26c261615c (patch)
tree52a7d56ab8c732e579cf3da4e390c33b7c587c57 /doc/users/fmarier.mdwn
parent3e0119a89f8968128f5436a68171279e5c6e2295 (diff)
parent8527643324102de36bb43785a14cf0a5020004e7 (diff)
Merge remote-tracking branch 'branchable/master'
Diffstat (limited to 'doc/users/fmarier.mdwn')
-rw-r--r--doc/users/fmarier.mdwn6
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)