Commit dfbd8a00 authored by unknown's avatar unknown

Merge trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
extra/resolveip.c:
  Auto merged
parents 69338e08 359b2ced
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