From: Frederic Marchal <fmarchal@users.sourceforge.net>
Date: Thu, 30 May 2013 08:47:52 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.code.sf.net/p/sarg/code
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=680b5298c12d09269c1fcf188879ecc99459abb3;p=thirdparty%2Fsarg.git

Merge branch 'master' of ssh://git.code.sf.net/p/sarg/code

Conflicts:
	html.c
---

680b5298c12d09269c1fcf188879ecc99459abb3