From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 20 Jun 2014 09:55:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: auth-3.4.0-rc1~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ad96811a4e0a50f7cbd684f1f0f980671df0169;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master'
---

3ad96811a4e0a50f7cbd684f1f0f980671df0169