From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Fri, 1 Jun 2012 18:23:32 +0000 (+0200)
Subject: Merge commit 'd82e81174c6b544f0718736c5'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06ef2cf69905587b09bcaa3ab387046e0a82b3e5;p=thirdparty%2Fsarg.git

Merge commit 'd82e81174c6b544f0718736c5'

Conflicts:
	CMakeLists.txt
	ChangeLog
	configure.in
	include/info.h
	useragent.c
---

06ef2cf69905587b09bcaa3ab387046e0a82b3e5