Merge branch 'bpdyndnsd'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 30 Jun 2010 08:51:02 +0000 (10:51 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 30 Jun 2010 08:51:02 +0000 (10:51 +0200)
commitf48e5feb3f1e499495a7bf01ce5871f16ceffaef
tree66ff8bb5d4e4472ed27b96b998f41be12319ae7f
parent4e2514c658207d7b805d686a8119073a63ad6e15
Merge branch 'bpdyndnsd'

Conflicts:
packages/bpdyndnsd/bpdyndnsd-0.1.tar.gz
packages/bpdyndnsd/bpdyndnsd.spec
update_cnf/src/Makefile.am