Commit 6991ee78 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com

manually merged

parents fc6dcf4d 306ab7dd
paul@central.snake.net
monty@donna.mysql.fi
heikki@donna.mysql.fi
serg@serg.mysql.com
This diff is collapsed.
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