From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Mar 2015 00:04:11 +0000 (+0100)
Subject: Merge branch 'develop' of ssh://eldy@git.code.sf.net/p/awstats/code into
X-Git-Tag: AWSTATS_7_5~55^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a33c6e615bf1ffa2807e07e68361f1d468a41db9;p=thirdparty%2FAWStats.git

Merge branch 'develop' of ssh://eldy@git.code.sf.net/p/awstats/code into
develop

Conflicts:
	wwwroot/cgi-bin/lib/robots.pm
---

a33c6e615bf1ffa2807e07e68361f1d468a41db9
diff --cc wwwroot/cgi-bin/lib/robots.pm
index 73b1c15f,055b48b9..13566479
--- a/wwwroot/cgi-bin/lib/robots.pm
+++ b/wwwroot/cgi-bin/lib/robots.pm
@@@ -1784,15 -1675,8 +1784,15 @@@
  'magpierss', 'MagpieRSS',
  'mail\.ru', '<a href="http://go.mail.ru/help/robots" title="Mail.ru bot home page [new window]" target="_blank">Mail.ru bot</a>',
  'mapoftheinternet\.com','<a href="http://MapoftheInternet.com/" title="MapoftheInternet.com home page [new window]" target="_blank">MapoftheInternet.com</a>',
 +'meanpathbot', '<a href="http://www.meanpath.com/meanpathbot.html" rel="nofollow" title="Meanpathbot Home Page [new window]" target="_blank">Meanpathbot</a>',
 +'mediabot', '<a href="http://isdownload.biz" rel="nofollow" title="MediaBot refers to isdownload.biz [new window]" target="_blank">MediaBot</a>',
  'mediapartners\-google','<a href="https://adwords.google.com/" title="Bot home page [new window]" target="_blank">Google AdSense</a>',
 +# 'Mediapartners-Google (Feb 12, 2015: no additial information in UA String, seems to use <a href="http://www.gigablast.com/" title="Gigablast Home page [new window]">GigablastOpenSource</a>',
 +# Uses UA string "Mediapartners-Google" only, and there were accesses using an UA string "GigablastOpenSource/1.0" from the same IP-Address.
- # Therefore this is probably not related to Google 4.3.2015 Albrecht Müller
++# Therefore this is probably not related to Google 4.3.2015 Albrecht M�ller
  'megite','<a href="http://www.megite.com/" title="Megite home page [new window]" target="_blank">Megite</a>',
 +'memorybot', '<a href="http://archivethe.net/en/index.php/about/internet_memory1" rel="nofollow" title="Archivethe.net Home Page [new window]" target="_blank">Archivethe.net</a>',
 +'metager2-verification-bot', '<a href="http://metager2.de/technology.php" rel="nofollow" title="metager2-verification-bot Home Page [new window]" target="_blank">metager2-verification-bot</a>',
  'metager\-linkchecker','MetaGer LinkChecker',
  'metaspinner','<a href="http://index.meta-spinner.de/" title="Metaspinner home page [new window]" target="_blank">Metaspinner</a>',
  'miadev',  '<a href="http://www.mia-marktplatz.de/spider" rel="nofollow" title="MiaDev spider [new window]" target="_blank">MiaDev spider</a>',
@@@ -2162,4 -2019,4 +2162,4 @@@
  'yahooysmcm'=>'Yahoo'
  );
  
--1;
++1;