]> git.ipfire.org Git - people/ms/ddns.git/commit
Merge remote-tracking branch 'stevee/udmedia.de'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Jun 2014 10:27:53 +0000 (10:27 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Jun 2014 10:27:53 +0000 (10:27 +0000)
commit005d325c3b7aa4d79db6ecd600a269ef15bf8f14
tree5bcf71cfc59d5a7891f6d8df38564a879ddd0d01
parentc7b3e85e6ba03551d31b4848dcf057b016447c8d
parent03bdd188a37f278853ca816e729eda888b4ec981
Merge remote-tracking branch 'stevee/udmedia.de'

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