Merge branch 'github'
commit580f584fd9f0692bf0a8c475874bc3e475fd978e
authorwimpunk <wimpunk@3873ddee-7413-0410-b6c4-c2c57c1ab35a>
Sun, 30 Apr 2017 14:43:19 +0000 (30 14:43 +0000)
committerwimpunk <wimpunk@3873ddee-7413-0410-b6c4-c2c57c1ab35a>
Sun, 30 Apr 2017 14:43:19 +0000 (30 14:43 +0000)
tree2b1cd87b53e5583971c2c1a4866f3f88fa3baf8a
parent871943cf55336a9ccf9d894acbca0171d1744f3f
Merge branch 'github'

Conflicts:
README.md
ddclient

git-svn-id: http://svn.code.sf.net/p/ddclient/code/trunk@198 3873ddee-7413-0410-b6c4-c2c57c1ab35a
README.md
ddclient