Merge remote-tracking branch 'stevee/nsupdate.info'

author Michael Tremer <michael.tremer@ipfire.org>

Wed, 9 Jul 2014 18:58:15 +0000 (18:58 +0000)

committer Michael Tremer <michael.tremer@ipfire.org>

Wed, 9 Jul 2014 18:58:15 +0000 (18:58 +0000)
author Michael Tremer <michael.tremer@ipfire.org>
Wed, 9 Jul 2014 18:58:15 +0000 (18:58 +0000)
committer Michael Tremer <michael.tremer@ipfire.org>
Wed, 9 Jul 2014 18:58:15 +0000 (18:58 +0000)
diff --cc README
Simple merge
diff --cc ddns.conf.sample
Simple merge
diff --cc src/ddns/providers.py
Simple merge
author	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 9 Jul 2014 18:58:15 +0000 (18:58 +0000)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 9 Jul 2014 18:58:15 +0000 (18:58 +0000)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
ddns.conf.sample	patch \|	diff1 \|	diff2 \|	blob \| history
src/ddns/providers.py	patch \|	diff1 \|	diff2 \|	blob \| history