Merge commit 'upstream/master' into prv/po

diff --git a/doc/users/cfm.mdwn b/doc/users/cfm.mdwn
new file mode 100644 (file)
index 0000000..4feab96
--- /dev/null
+++ b/doc/users/cfm.mdwn
@@ -0,0 +1 @@
+I maintain a [home page](http://www.panix.com/~cfm/ "Cory Myers").