summaryrefslogtreecommitdiff
path: root/doc/users
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-02-05 15:59:42 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-02-05 15:59:42 -0500
commitf92505d78b82c6ac146e43054ebd12441575a602 (patch)
tree2897a21c04f473ee3100a6a59ccce6336a1f7692 /doc/users
parentfbe2ab4419e086ff84991bf25f1549aaabc5143b (diff)
parent11f4942d68f3276bfdc4688e4091e559f9481874 (diff)
Merge branch 'master' into prefix-directives
Diffstat (limited to 'doc/users')
-rw-r--r--doc/users/Edward_Betts.mdwn4
-rw-r--r--doc/users/perolofsson.mdwn7
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
new file mode 100644
index 000000000..8653c33c2
--- /dev/null
+++ b/doc/users/Edward_Betts.mdwn
@@ -0,0 +1,4 @@
+My watchlist:
+
+[[inline pages="todo/allow_wiki_syntax_in_commit_messages" archive="yes" sort="mtime" atom="yes"]]
+
diff --git a/doc/users/perolofsson.mdwn b/doc/users/perolofsson.mdwn
new file mode 100644
index 000000000..e03cadbb5
--- /dev/null
+++ b/doc/users/perolofsson.mdwn
@@ -0,0 +1,7 @@
+[[meta title="Per Olofsson"]]
+
+Per Olofsson
+
+* <pelle@dsv.su.se>
+* <pelle@debian.org>
+* <http://people.dsv.su.se/~pelle/>.