From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 24 Jun 2014 09:57:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/fixes'
X-Git-Tag: 001~6
X-Git-Url: http://git.ipfire.org/?p=ddns.git;a=commitdiff_plain;h=fb94cc5aa70004a58571281e0e3c7f398ec3207a

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

fb94cc5aa70004a58571281e0e3c7f398ec3207a