Remove /var/log/shinken in purge
Fix changelog
Revert "Fix changelog"

To late, already uploaded :-(

This reverts commit b99194fdb22c1bd8301afb95e9c7fb5d498f1f42.
Merge remote-tracking branch 'upstream/master' into kaji

Conflicts:
	debian/changelog
Bump kaji version