Merge branch 'master' of ssh://git.average.org/~/pdns-pipe-nmc
authorEugene Crosser <crosser@average.org>
Sun, 20 Apr 2014 16:03:11 +0000 (20:03 +0400)
committerEugene Crosser <crosser@average.org>
Sun, 20 Apr 2014 16:03:11 +0000 (20:03 +0400)

Trivial merge