From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 14 Jun 2014 22:43:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'stevee/fixes'
X-Git-Tag: 001~47
X-Git-Url: http://git.ipfire.org/?p=ddns.git;a=commitdiff_plain;h=7593902436303df16e822a60147173be63859acc

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

7593902436303df16e822a60147173be63859acc