Conflicts: CMakeLists.txt configure.ac db/zm_update-1.28.101.sql src/zm_monitor.cpp src/zm_monitor.h version