Commit a240df33 authored by Jorgen Loland's avatar Jorgen Loland

local merge

parents 92eab995 5dc0872d
MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5 MYSQL_VERSION_MINOR=5
MYSQL_VERSION_PATCH=14 MYSQL_VERSION_PATCH=15
MYSQL_VERSION_EXTRA= MYSQL_VERSION_EXTRA=
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