From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 17 May 2012 12:33:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/pdns'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7448acdf7551f09b87233eb697e4d8d42aefaca;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/pdns'
---

a7448acdf7551f09b87233eb697e4d8d42aefaca