Commit 030cb739 authored by unknown's avatar unknown

Merge eel.(none):/home/jonas/src/mysql-5.0

into  eel.(none):/home/jonas/src/mysql-5.0-push


BitKeeper/etc/config:
  Auto merged
parents d2797ea9 d0c821d3
...@@ -71,5 +71,6 @@ hours: ...@@ -71,5 +71,6 @@ hours:
[arjen:]checkout:get [arjen:]checkout:get
[kostja:]checkout:get [kostja:]checkout:get
[nick:]checkout:get [nick:]checkout:get
[jonas:]checkout:get
checkout:edit checkout:edit
eoln:unix eoln:unix
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment