summaryrefslogtreecommitdiff
path: root/doc/users
diff options
context:
space:
mode:
authorfmarier <fmarier@web>2011-02-24 08:31:56 +0000
committerJoey Hess <joey@kitenet.net>2011-02-24 08:31:56 +0000
commit639b476041a8a89ef714268a45033717af5770ac (patch)
treea0e1244929aa2a8efc16cc05372669f479b49019 /doc/users
parentddcab5e4dce6cb6cd130f7464438b8bc5227630f (diff)
Diffstat (limited to 'doc/users')
-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..cb115a1fe
--- /dev/null
+++ b/doc/users/fmarier.mdwn
@@ -0,0 +1,6 @@
+# François Marier
+
+Free Software and Debian Developer
+
+* [Blog](http://feeding.cloud.geek.nz)
+* [Identica](http://identi.ca/fmarier) / [Twitter](http://twitter.com/fmarier)