Merge branch 'master' of https://github.com/i-maravic/pdns into i-maravic-master

diff --cc pdns/dynlistener.cc
Simple merge

diff --cc pdns/dynloader.cc
Simple merge

diff --cc pdns/dynmessenger.cc
Simple merge

diff --cc pdns/dynmessenger.hh
Simple merge

diff --cc pdns/pdns-recursor.init.d
Simple merge

diff --cc pdns/pdnsexception.hh
Simple merge

diff --cc pdns/receiver.cc
Simple merge

diff --cc pdns/unix_utility.cc
Simple merge

diff --cc pdns/utility.hh
Simple merge