Fix issue #1689
Convert int to string for concatenation to exception, fixes #1564
Merge pull request #1697 from cmouse/fix-issue-1564

Convert int to string for concatenation to exception, fixes #1564
Check for  __FreeBSD_kernel__ as per https://lists.debian.org/debian-bsd/2006/03/msg00127.html, fixes #1684
Merge pull request #1698 from cmouse/fix-issue-1684

Check for  __FreeBSD_kernel__ as per https://lists.debian.org/debian-bsd...
Merge pull request #1696 from cmouse/fix-sissue-1689

Fix issue #1689
support EVERY future version of OS X, fixes #1702
__FreeBSD_kernel__ is defined but empty on systems with FreeBSD kernels, breaking compile. Thanks pawal
Merge branch 'master' of github.com:PowerDNS/pdns
report how many milliseconds we actually waited so trace-regex output is a bit less confusing
how to add powerdns recursor to upstart
docs for 3.6.1 plus security notification
oops, 3.6.1 is not vulnerable, 3.6.0 is, thanks Winfried!
add initlock in lmdb backend
add missing #include <pthread.h> to rec-channel.hh
switch from reversed zones to labelReversed in lmdb-backend
Merge pull request #1711 from mind04/lmdb

add initlock in lmdb backend
Merge pull request #1712 from mind04/osx

add missing #include <pthread.h> to rec-channel.hh
Migrate existing DNSSEC tables to InnoDB
GeoIP backend implementation