From: Laurent Destailleur Date: Fri, 7 Feb 2014 20:16:51 +0000 (+0100) Subject: Merge commit '95c15e5ff7a636d1852ce406d552e4edf825d2b3' into develop X-Git-Tag: AWSTATS_7_4~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72fb970841385b8354beb37b65c66b2c96fd103e;p=thirdparty%2FAWStats.git Merge commit '95c15e5ff7a636d1852ce406d552e4edf825d2b3' into develop --- 72fb970841385b8354beb37b65c66b2c96fd103e diff --cc tools/awstats_buildstaticpages.pl index 1a4ba525,de8f2b34..a50ce8da mode 100755,100644..100755 --- a/tools/awstats_buildstaticpages.pl +++ b/tools/awstats_buildstaticpages.pl diff --cc wwwroot/cgi-bin/awstats.pl index 1a874d97,145a4241..7df54070 mode 100755,100644..100755 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl