summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-08-11 22:44:43 +0300
committermonty@mashka.mysql.fi <>2003-08-11 22:44:43 +0300
commit2263e3e51faba531a0a7055dbf706a6a8719ad70 (patch)
tree3c0ddcb446b8be099c3ab2616c459a573ee3cf92 /BitKeeper
parent1279f9b024614cf97cf447cfb10d6d7d69abb8bc (diff)
parent6e7a509d06824447e427dd44d5692489267d9c4b (diff)
downloadmariadb-git-2263e3e51faba531a0a7055dbf706a6a8719ad70.tar.gz
Merge with 4.0.14
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok2
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index f858af82736..299c12c1f4a 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -63,6 +63,7 @@ miguel@hegel.br
miguel@hegel.local
miguel@light.
miguel@light.local
+miguel@sartre.local
mmatthew@markslaptop.
monty@bitch.mysql.fi
monty@butch.
@@ -86,6 +87,7 @@ nick@mysql.com
nick@nick.leippe.com
papa@gbichot.local
paul@central.snake.net
+paul@ice.local
paul@ice.snake.net
paul@teton.kitebird.com
pem@mysql.com