Merge remote-tracking branch 'stevee/twodns.de'

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

diff --cc ddns.conf.sample
Simple merge

diff --cc src/ddns/__init__.py
index 38b3ad7014585b26e725aeaf68e73a0452c38343,18d89ec09da172850fd9ccfe8bbf596d495e7dfe..f22eb66c400bf735ab1eee741fde2ea68d30b406
--- 1/src/ddns/__init__.py
--- 2/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@@ -106,7 -104,7 +106,8 @@@ class DDNSCore(object)
                        DDNSProviderRegfish,
                        DDNSProviderSelfhost,
                        DDNSProviderSPDNS,
 +                      DDNSProviderStrato,
+                       DDNSProviderTwoDNS,
                        DDNSProviderVariomedia,
                ):
                        self.register_provider(provider)

diff --cc src/ddns/providers.py
index fc03af2b7eef0a8fd3dc065b7b3302d189ef72be,fdc86c69d53778f561d7a303e430f7b6915db7be..3d89350087f17dbc2823280d54d90e7fe5b95f1e
--- 1/src/ddns/providers.py
--- 2/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@@ -780,22 -666,31 +780,45 @@@ class DDNSProviderSPDNS(DDNSProviderDyn
        # http://wiki.securepoint.de/index.php/SPDNS_Update-Tokens
  
        url = "https://update.spdns.de/nic/update"
 +
 +
 +class DDNSProviderStrato(DDNSProviderDynDNS):
 +      INFO = {
 +              "handle"    : "strato.com",
 +              "name"      : "Strato AG",
 +              "website"   : "http:/www.strato.com/",
 +              "protocols" : ["ipv4",]
 +      }
 +
 +      # Information about the request and response can be obtained here:
 +      # http://www.strato-faq.de/article/671/So-einfach-richten-Sie-DynDNS-f%C3%BCr-Ihre-Domains-ein.html
 +
 +      url = "https://dyndns.strato.com/nic/update"
  
  
+ class DDNSProviderTwoDNS(DDNSProviderDynDNS):
+       INFO = {
+               "handle"    : "twodns.de",
+               "name"      : "TwoDNS",
+               "website"   : "http://www.twodns.de",
+               "protocols" : ["ipv4",]
+       }
+ 
+       # Detailed information about the request can be found here
+       # http://twodns.de/en/faqs
+       # http://twodns.de/en/api
+ 
+       url = "https://update.twodns.de/update"
+ 
+       def _prepare_request_data(self):
+               data = {
+                       "ip" : self.get_address("ipv4"),
+                       "hostname" : self.hostname
+               }
+ 
+               return data
+ 
+ 
  class DDNSProviderVariomedia(DDNSProviderDynDNS):
        INFO = {
                "handle"   : "variomedia.de",