From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Wed, 30 Jun 2010 08:51:02 +0000 (+0200)
Subject: Merge branch 'bpdyndnsd'
X-Git-Tag: v2.6~106
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=f48e5feb3f1e499495a7bf01ce5871f16ceffaef;p=libi2ncommon

Merge branch 'bpdyndnsd'

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