code: go on
Merge branch '2.0' of github.com:HardySimpson/zlog into 2.0

Conflicts:
	Changelog
	src/conf.c
	zlog.conf.example
Merge branch '2.0' of github.com:HardySimpson/zlog into 2.0

Conflicts:
	Changelog
	src/conf.c
	zlog.conf.example