Merge commit 'upstream/master' into prv/po

2009-01-18 13:56:15 +01:00 · 2009-01-18 13:56:15 +01:00 · 14b49376dc
parent 73a7bd2f68 aecc45bd20
commit 14b49376dc
1 changed files with 1 additions and 0 deletions
--- a/doc/users/cfm.mdwn
+++ b/doc/users/cfm.mdwn
@ -0,0 +1 @@
+I maintain a [home page](http://www.panix.com/~cfm/ "Cory Myers").
				`@ -0,0 +1 @@`
				`I maintain a [home page](http://www.panix.com/~cfm/ "Cory Myers").`