* plugins/check_pingdom: fix a bug on contact id type
Merge branch 'master' of github.com:cyril-bouthors/nagios-plugins-cyb

Conflicts:
	debian/changelog
* debian/changelog: bad merge fixed