From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Tue, 14 Feb 2012 16:58:57 +0000 (+0100)
Subject: Merge branch 'v2.3' of ssh://sarg.git.sourceforge.net/gitroot/sarg/sarg into v2.3
X-Git-Tag: v2.3.3-pre1~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8523e5ded9d9d80d6330c6d346dc57f5cf147bf;p=thirdparty%2Fsarg.git

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

b8523e5ded9d9d80d6330c6d346dc57f5cf147bf