]> git.ipfire.org Git - thirdparty/sarg.git/commitdiff
Merge branch 'v2.3' of ssh://sarg.git.sourceforge.net/gitroot/sarg/sarg into v2.3
authorFrédéric Marchal <fmarchal@users.sourceforge.net>
Sun, 15 Jul 2012 17:43:03 +0000 (19:43 +0200)
committerFrédéric Marchal <fmarchal@users.sourceforge.net>
Sun, 15 Jul 2012 17:43:03 +0000 (19:43 +0200)
1  2 
util.c

diff --cc util.c
Simple merge