summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authortomas@poseidon.ndb.mysql.com <>2004-10-03 21:39:04 +0000
committertomas@poseidon.ndb.mysql.com <>2004-10-03 21:39:04 +0000
commitf6ad058388e40f467eace3cb09d6712e6b3eb598 (patch)
treeaba1618cac773466e58a7ff45f66bb205fe52130 /BitKeeper
parentfbf2a6ac0ca6f15c137cf2ea19a67fe7808c6a64 (diff)
parent673dc109b41784843d2f26c826ddfb77ea8bd12c (diff)
downloadmariadb-git-f6ad058388e40f467eace3cb09d6712e6b3eb598.tar.gz
Merge
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 6c57b7254e0..e3aefbf3efc 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -94,6 +94,7 @@ kostja@oak.local
lenz@kallisto.mysql.com
lenz@mysql.com
magnus@neptunus.(none)
+magnus@shellback.(none)
marko@hundin.mysql.fi
miguel@hegel.(none)
miguel@hegel.br