Merge commit '95c15e5ff7a636d1852ce406d552e4edf825d2b3' into develop

author Laurent Destailleur <eldy@destailleur.fr>

Fri, 7 Feb 2014 20:16:51 +0000 (21:16 +0100)

committer Laurent Destailleur <eldy@destailleur.fr>

Fri, 7 Feb 2014 20:16:51 +0000 (21:16 +0100)
author Laurent Destailleur <eldy@destailleur.fr>
Fri, 7 Feb 2014 20:16:51 +0000 (21:16 +0100)
committer Laurent Destailleur <eldy@destailleur.fr>
Fri, 7 Feb 2014 20:16:51 +0000 (21:16 +0100)
diff --cc tools/awstats_buildstaticpages.pl

index 1a4ba525306a1fb7e74a0cbb4193b58c3a2ef0c6,de8f2b341abbdc99238a7e3a35b3882b43a0e1c7..a50ce8da7b82aa7120b5d634ec322e155c297382

mode 100755,100644..100755
--- 1/tools/awstats_buildstaticpages.pl
--- 2/tools/awstats_buildstaticpages.pl
+++ b/tools/awstats_buildstaticpages.pl
diff --cc wwwroot/cgi-bin/awstats.model.conf
Simple merge
diff --cc wwwroot/cgi-bin/awstats.pl

index 1a874d971a816865ce285755080e9d4545e3e0dc,145a4241fdae543cb7c01b338edafd27d7e469cb..7df54070a975ece685666f007d42c6a972b1f51f

mode 100755,100644..100755
--- 1/wwwroot/cgi-bin/awstats.pl
--- 2/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
author	Laurent Destailleur <eldy@destailleur.fr>
	Fri, 7 Feb 2014 20:16:51 +0000 (21:16 +0100)
committer	Laurent Destailleur <eldy@destailleur.fr>
	Fri, 7 Feb 2014 20:16:51 +0000 (21:16 +0100)
		1	2
tools/awstats_buildstaticpages.pl	patch \|	diff1 \|	diff2 \|	blob \| history
wwwroot/cgi-bin/awstats.model.conf	patch \|	diff1 \|	diff2 \|	blob \| history
wwwroot/cgi-bin/awstats.pl	patch \|	diff1 \|	diff2 \|	blob \| history