Merge remote-tracking branch 'stevee/variomedia.de'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Jun 2014 09:55:45 +0000 (11:55 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Jun 2014 09:55:45 +0000 (11:55 +0200)
commit4ec90b9325b1561f7783b28323e25dd65cadb000
treeb8f663dbee38bb570c4e51a71958a524b2e0eeed
parentc58dd4a70ab7db49ee8453fd98ca879fd53a62da
parentc8c7ca8f599077aaa5c477e74dbb550dc4772cbc
Merge remote-tracking branch 'stevee/variomedia.de'

Conflicts:
src/ddns/__init__.py
src/ddns/providers.py
ddns.conf.sample
src/ddns/__init__.py
src/ddns/providers.py