]> git.ipfire.org Git - thirdparty/sarg.git/commitdiff
Merge branch 'v2.3' of ssh://git.code.sf.net/p/sarg/code into v2.3
authorFrederic Marchal <fmarchal@users.sourceforge.net>
Fri, 20 Feb 2015 14:05:51 +0000 (15:05 +0100)
committerFrederic Marchal <fmarchal@users.sourceforge.net>
Fri, 20 Feb 2015 14:05:51 +0000 (15:05 +0100)
1  2 
log.c

diff --cc log.c
Simple merge