Merge remote-tracking branch 'ms/ddns.cgi-fixes' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Aug 2014 19:06:13 +0000 (21:06 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Aug 2014 19:06:13 +0000 (21:06 +0200)
commit935c2f233b730a010b241029f559e837d93a7ea7
treeae192c125007c1c83e932cefc281d87dc94bc103
parent80a5cc5609f717be24c2ca5f3f60b46412dc11cd
parent4851bc81f33058d814028ab91f4badf46739f373
Merge remote-tracking branch 'ms/ddns.cgi-fixes' into next

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