From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 13 May 2013 09:38:39 +0000 (+0200)
Subject: Merge branch 'travis-makedist'
X-Git-Tag: auth-3.3-rc1~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f723b75cabc40b789eb410b2394dff031d61ee0;p=thirdparty%2Fpdns.git

Merge branch 'travis-makedist'
---

8f723b75cabc40b789eb410b2394dff031d61ee0