local merge

This commit is contained in:
Jorgen Loland 2011-06-10 10:55:46 +02:00
commit 9506c81809

View File

@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
MYSQL_VERSION_PATCH=14
MYSQL_VERSION_PATCH=15
MYSQL_VERSION_EXTRA=