Commit 6ebf44d3 authored by unknown's avatar unknown

Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540

into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540


sql/log.cc:
  manual merge
parents 6e3bed6a 5d7082e1
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