From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 10 Aug 2011 18:14:42 +0000 (+0300)
Subject: Merge branch 'http-master'
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=debe1004676d5431e571d9c4361072661dcc88c4;hp=debe1004676d5431e571d9c4361072661dcc88c4;p=libs%2Fnet.git

Merge branch 'http-master'

Conflicts:
	.gitignore
	Build
---