Conflicts: .cproject src/Makefile.am src/configmanager.cc src/contact-masquerader.hh src/event.cc src/module-auth.cc src/module.cc src/module.hh