Merge remote-tracking branch 'stevee/twodns.de'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Jun 2014 10:25:55 +0000 (10:25 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Jun 2014 10:25:55 +0000 (10:25 +0000)
commitc7b3e85e6ba03551d31b4848dcf057b016447c8d
treedd36385dda346ba2ff72313cacf18643accb7a24
parent7488825c2fcecdcf42888f4a20f9a1b30f6f63e9
parenta6183090496610c5eeccdc5a783bb85c435c9e16
Merge remote-tracking branch 'stevee/twodns.de'

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