__FreeBSD_kernel__ is defined but empty on systems with FreeBSD kernels, breaking compile. Thanks pawal
implement & document rec_control version, closes #1706
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
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
GeoIP backend implementation