summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authormonty@tik.mysql.fi <>2001-06-11 15:07:42 +0300
committermonty@tik.mysql.fi <>2001-06-11 15:07:42 +0300
commitc973f61ac6018c5d1f371d07f31f4fe429bedb81 (patch)
tree8c159bf0b7ac39297b7107fce1cdea569b61661f /BitKeeper
parentc65da53a48295b342b4dfb72f129a73044129a58 (diff)
parent1f409baf4cb3bca2ee62b40363a2179f0a3b1f88 (diff)
downloadmariadb-git-c973f61ac6018c5d1f371d07f31f4fe429bedb81.tar.gz
Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok3
1 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 8f4e935d486..39de42e998d 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,4 +1,5 @@
heikki@donna.mysql.fi
jani@janikt.pp.saunalahti.fi
-paul@teton.kitebird.com
+monty@tik.mysql.fi
mwagner@evoq.mwagner.org
+paul@teton.kitebird.com