Commit 1561ee5c authored by unknown's avatar unknown

Merge host.loc:/home/uchum/work/5.0-opt

into  host.loc:/home/uchum/work/5.1-opt


configure.in:
  Auto merged
sql/item.cc:
  Auto merged
parents abe22f2e 8e473edd
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