Merge remote-tracking branch 'stevee/namecheap.com'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 21 Jun 2014 15:56:48 +0000 (15:56 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 21 Jun 2014 15:56:48 +0000 (15:56 +0000)
commit9820673130fc3c9c5adc72748cfb40bf82e16693
tree64d97becc998878cf28b387e8912a282f158f6ba
parent3b16fdb1433f64122fb3cde2e86e9acf18df430f
parentd1cd57ebdfdd37a125093883c0e829eeda81c6c6
Merge remote-tracking branch 'stevee/namecheap.com'

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