From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Sun, 15 Jul 2012 17:43:03 +0000 (+0200)
Subject: Merge branch 'v2.3' of ssh://sarg.git.sourceforge.net/gitroot/sarg/sarg into v2.3
X-Git-Tag: v2.3.3~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebb1239d54323a0e770f8576295d934944f38f9f;p=thirdparty%2Fsarg.git

Merge branch 'v2.3' of ssh://sarg.git.sourceforge.net/gitroot/sarg/sarg into v2.3
---

ebb1239d54323a0e770f8576295d934944f38f9f