From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Thu, 3 Mar 2011 09:36:52 +0000 (+0100)
Subject: Merge branch 'proxy-time-profiles'
X-Git-Tag: v2.6~83
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=f19e708c5e4ae62f0975c96cd00977bd25da3ead;p=libi2ncommon

Merge branch 'proxy-time-profiles'

Conflicts:
	generate/test/Makefile.am
---

f19e708c5e4ae62f0975c96cd00977bd25da3ead