From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 7 Aug 2014 19:06:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'ms/ddns.cgi-fixes' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=935c2f233b730a010b241029f559e837d93a7ea7;p=people%2Farne_f%2Fipfire-2.x.git

Merge remote-tracking branch 'ms/ddns.cgi-fixes' into next

Conflicts:
	html/cgi-bin/ddns.cgi
---

935c2f233b730a010b241029f559e837d93a7ea7