summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authormronstrom@mysql.com <>2005-06-06 10:42:11 +0200
committermronstrom@mysql.com <>2005-06-06 10:42:11 +0200
commit6a376bec64898073f3dff1fe95d29765cddcc32d (patch)
tree89acc33b2d35b7f91ba4192b117d0f1d82b4604a /BitKeeper
parent52340c550bc877acb8b1a53c7cbb17b405511245 (diff)
parent1eaacaf194f314ac029c2cfa5ebaad3dcf764243 (diff)
downloadmariadb-git-6a376bec64898073f3dff1fe95d29765cddcc32d.tar.gz
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/Users/mikron/bug10901
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 185f84cc772..c2a093bb610 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -104,6 +104,7 @@ monty@tik.
monty@tik.mysql.fi
monty@tramp.mysql.fi
monty@work.mysql.com
+mronstrom@mysql.com
mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org
mwagner@here.mwagner.org