Commit 030cb739 authored by unknown's avatar unknown
Browse files

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
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -71,5 +71,6 @@ hours:
[arjen:]checkout:get
[kostja:]checkout:get
[nick:]checkout:get
[jonas:]checkout:get
checkout:edit
eoln:unix