merge latest changes

diff --cc ChangeLog
index 8bcab0d952f6475002160dfc54e57c03f9c20743,ec885b9ddda5d71262137b5ba07f3873c2192205..8faff44ae87ebd233bdca1b91ec44be711703706
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,8 @@@
 +UNRELEASED
 +  * Allow running as non-root on Mac OS X by using non-privileged ICMP (#7)
 +
+ 2013-10-10  David Schweikert  <david@schweikert.ch>
+   * Version 3.6
    * Fix loop issue after 65536 pings (reported by Peter Folk and GBert, #12)
    * Minimum ping data size is now 0
    * Removed setsockopt IPV6_CHECKSUM, which shouldn't be set and breaks