Commit abc20094 authored by unknown's avatar unknown

- manual merge


sql/sql_udf.cc:
  Auto merged
configure.in:
  - merge: keep local version number
parents a69ba9cd 7368d656
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