new file:   my.cnf
	renamed:    mysql-client.install -> mysql.install
	new file:   mysqld-post.sh
	new file:   mysqld-tmpfile.conf
	new file:   patch-CMakeLists.txt
	new file:   patch-client_CMakeLists.txt
	new file:   patch-cmake_plugin.cmake
	new file:   patch-extra_CMakeLists.txt
	new file:   patch-extra_yassl_taocrypt_src_integer.cpp
	new file:   patch-include_CMakeLists.txt
	new file:   patch-include_my_compare.h
	new file:   patch-include_myisam.h
	new file:   patch-libmysql_CMakeLists.txt
	new file:   patch-libservices_CMakeLists.txt
	new file:   patch-man_CMakeLists.txt
	new file:   patch-mysys_default.c
	new file:   patch-scripts_CMakeLists.txt
	new file:   patch-scripts_mysqld_safe.sh
	new file:   patch-sql_CMakeLists.txt
	new file:   patch-sql_sys_vars.cc
	new file:   patch-support-files_CMakeLists.txt
Merge branch 'master' of git://github.com/Amzo/ArchBSD

Conflicts:
	core/mysql-client/PKGBUILD