master
Substitute bindir in nghttpx-upstart.conf
cmake: process contrib/
Merge branches 'master' and 'cmake-updated' into cmake
Make traditional init script fail if new config file is broken
nghttpx-logrotate: Don't use killall since we have multiple processes
nghttpx: add systemd support
Rearrange imports
added apparmor profile