Merge remote-tracking branch 'stevee/dynu.com'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 17 Jun 2014 17:57:50 +0000 (19:57 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 17 Jun 2014 17:57:50 +0000 (19:57 +0200)
commit1231e159b10c5ae7874453e8a21e40208266a18b
tree01d1c3586c5d971c5d46b0b691803c07c326a750
parentaff71719557bfdfaa4db23535f97621f09379520
parent3a8407fa7f0def40fcbd6789586903171b5aaff6
Merge remote-tracking branch 'stevee/dynu.com'

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