]> git.ipfire.org Git - oddments/ddns.git/commit
Merge remote-tracking branch 'stevee/freedns.afraid.org'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Jun 2014 09:47:33 +0000 (11:47 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Jun 2014 09:47:33 +0000 (11:47 +0200)
commit68fce572223e618c85e2aba1f15b96f26d04db91
treecca6762d7ca427de0e3290fb609b51e9cfa18856
parent7593902436303df16e822a60147173be63859acc
parent4668782831c4462c71c58686e3d79331c589f327
Merge remote-tracking branch 'stevee/freedns.afraid.org'

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