Merge from emacs-24; up to 117698

[gnu-emacs] / etc / DEVEL.HUMOR

diff --git a/etc/DEVEL.HUMOR b/etc/DEVEL.HUMOR
index 8b9430bd30559c8d38f2808b7d2b1407ae97f2a0..7521f7950b10fdac0134e3a314904047d04b25e8 100644 (file)
--- a/etc/DEVEL.HUMOR
+++ b/etc/DEVEL.HUMOR
@@ -191,6 +191,14 @@ constants with anything like the universality of e and pi."
 printer drivers.  Couldn't that lead to problems for the printer
 drivers?"
   "Current research is that software does not suffer feelings of
-depression or loneliness when it is left out or the picture, so I
+depression or loneliness when it is left out of the picture, so I
 wouldn't worry about it too much."
                                 -- Lennart Borgman and Jason Rumney
+
+----------------------------------------------------------------------
+
+  "... a non-CS-educated guy like me ..."
+
+  "Kind of late, but thanks for letting us know.  I've just revoked your
+  write access to the repository for the obvious safety reasons,"
+                                -- Bastien Guerry and Stefan Monnier