From d7c0350a5add7868c51fdb29f6669ba974acaaec Mon Sep 17 00:00:00 2001
From: Nitrox202 <devnull@localhost>
Date: Fri, 15 Apr 2011 19:09:13 +0100
Subject: [PATCH] sort

---
 fanboy-adblocklist-addon.txt            |  6 +++---
 fanboy-adblocklist-current-expanded.txt | 16 ++++++++--------
 fanboy-adblocklist-stats.txt            | 10 +++++-----
 opera/urlfilter-stats.ini               |  8 ++++----
 opera/urlfilter.ini                     |  6 +++---
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/fanboy-adblocklist-addon.txt b/fanboy-adblocklist-addon.txt
index 3928c627c..f6ef355c1 100644
--- a/fanboy-adblocklist-addon.txt
+++ b/fanboy-adblocklist-addon.txt
@@ -1,5 +1,5 @@
 [Adblock Plus 1.1]
-! Checksum: gSMShviAHabF5OvHmU6abA
+! Checksum: Vml0z9xZ4uvZzjXUBXxPaQ
 ! Fanboy's Annoyance list Addon 
 ! Updated: 15 Apr 2011
 ! This list expires after 4 days
@@ -202,7 +202,6 @@ _social_icons.
 ||reddit.com/static/$third-party
 ||sharethis.com^$third-party
 ||skysa.com^
-||survey.io^$third-party
 ||slashdot.org^$third-party
 ||smarterfox.com^$third-party
 ||sociallist.org^$third-party
@@ -216,6 +215,7 @@ _social_icons.
 ||stumble-upon.com^$third-party,domain=~stumbleupon.com
 ||stumbleupon.com/badge/$third-party
 ||stumbleupon.com/hostedbadge$third-party
+||survey.io^$third-party
 ||technorati.com^$third-party
 ||theslingshot.com^$third-party
 ||toolbar.cdn.gigya.com^
@@ -1408,6 +1408,7 @@ guardian.co.uk##.trail-icon
 guidingtech.com###text-3
 guidingtech.com###upprev_box
 guyism.com##.newsletter
+hackaday.com##.sharing
 hardware-revolution.com##.subscribebox
 hbr.org###articleToolbarTopRD
 hbr.org###pageRightSubColumn
@@ -1701,7 +1702,6 @@ pcauthority.com.au##.facebook-twitter
 pcmag.com##.about-ads
 pcmag.com##.control-side
 pcmag.com##.share
-hackaday.com##.sharing
 pcmag.com##.shareModule
 pcmag.com##.subscribe-panel
 pcworld.com###connect
diff --git a/fanboy-adblocklist-current-expanded.txt b/fanboy-adblocklist-current-expanded.txt
index 2765cd3d2..d8472cc39 100644
--- a/fanboy-adblocklist-current-expanded.txt
+++ b/fanboy-adblocklist-current-expanded.txt
@@ -1,5 +1,5 @@
 [Adblock Plus 1.1]
-! Checksum: 9e8/9XlQHoRW59KJEI07sw
+! Checksum: uptQ/VAfgtCcdZvENjdUnw
 ! Fanboy's Adblock list
 ! Updated: 15 Apr 2011
 ! This list expires after 5 days
@@ -516,6 +516,7 @@
 /adrevolver/*
 /adriver.
 /AdRobot.
+/AdRollPixel.
 /adroot/*
 /adrot.js
 /adrotate/*
@@ -819,7 +820,6 @@
 /ALWebAd_
 /am/ads.
 /amazon/iframeproxy-
-/AdRollPixel.
 /amazon/widget/*
 /anchorad.
 /annonse/*
@@ -2277,6 +2277,7 @@ images/ads/*
 ||tripadvisor.com/adp/
 ||ugo.com/takeover/
 ||uk.ebayobjects.com^$subdocument
+||ultimate-guitar.com/_img/takeover/
 ||unicast.ign.com/assets/
 ||unicast.msn.com^
 ||usatoday.net^*/lb-agate.png
@@ -2288,7 +2289,6 @@ images/ads/*
 ||washingtonpost.com/wp-srv/ad/ad_
 ||weselectmodels.com/ZillionaireDate_Banner/
 ||worldmag.com/images/media/
-||ultimate-guitar.com/_img/takeover/
 ||xsreviews.co.uk/style/bgg2.jpg
 ||yahoo.com/livewords/
 ||yahoo.com/ysmload.
@@ -8547,6 +8547,8 @@ youporn.com###producer
 ##.advertisementColumnGroup
 ##.advertisementGif
 ##.advertisementLabel
+##.advertisementonblue
+##.advertisementonwhite
 ##.advertisementPanel
 ##.advertisementText
 ##.AdvertisementTextTag
@@ -8798,8 +8800,6 @@ youporn.com###producer
 ##.confirm_ad_right
 ##.confirm_leader_ad
 ##.consoleAd
-##.advertisementonblue
-##.advertisementonwhite
 ##.container-adwords
 ##.containerSqAd
 ##.content_ad
@@ -10979,7 +10979,6 @@ google.com##.nH.MC
 google.com##.ra
 google.com##.ta
 google.com##.z0DeRc
-hackaday.com###medrect
 google.com##[id="adt"][align="right"]
 google.com.au###mclip_control
 google.com.au###rhscol
@@ -11027,6 +11026,7 @@ h-online.com###bannerzone
 h-online.com##.bcadv
 haaretz.com##.buttonBanners
 haaretz.com##TABLE[bgcolor="#ffffff"][width="120"]
+hackaday.com###medrect
 hardballtalk.nbcsports.com###top_90h
 hardocp.com###announcements
 harpers.org##.topbanner
@@ -12701,6 +12701,8 @@ ugo.com###superMast
 ugoplayer.com###content_right_side_advertisement_on_top_wrapper
 ugotfile.com##a[href="https://www.astrill.com/"]
 uk.news.yahoo.com##div[style="font-size:10px;font-family:Verdana,arial,sans-serif;text-align:center"]
+ultimate-guitar.com##.pca
+ultimate-guitar.com##.pca2
 ultimate-guitar.com##td[style="height:110px; vertical-align:middle; text-align:center"]
 ultimate-rihanna.com###ad
 uncoached.com###sidebar300X250
@@ -12737,8 +12739,6 @@ ustream.tv###LoginBannerWrapper
 ustream.tv##.banner
 ustream.tv##.largeRectBanner
 uvnc.com##div[style="width: 300px; height: 250px; background-color: #FFFFFF"]
-ultimate-guitar.com##.pca
-ultimate-guitar.com##.pca2
 v3.co.uk###skyAdNewsletter
 v3.co.uk###superSky
 vaildaily.com###header
diff --git a/fanboy-adblocklist-stats.txt b/fanboy-adblocklist-stats.txt
index 4aee67138..2c57169c8 100644
--- a/fanboy-adblocklist-stats.txt
+++ b/fanboy-adblocklist-stats.txt
@@ -1,5 +1,5 @@
 [Adblock Plus 1.1]
-! Checksum: uv4hiuLd4rw20CAkZDFVpw
+! Checksum: iLIsB2w+734hsiCDbuIGpg
 ! Fanboy Tracking/Stats V3 Blocking
 ! Updated: 15 Apr 2011
 ! This list expires after 7 days
@@ -16,7 +16,6 @@
 -google-analytics.
 -seo-tracker.
 -tracking.js?
-_pixelmap.js
 .au/t.ashx?
 .com.au/c.gif
 .com.au/HG?hc=
@@ -254,7 +253,6 @@ _pixelmap.js
 /bidiq.
 /bin/reff.php
 /bizo.js
-/boomerang.js
 /blank.gif?
 /blog/traffic/?
 /blogtotal_stats_
@@ -265,6 +263,7 @@ _pixelmap.js
 /bm-analytics/*
 /bm-bam-trk.
 /bn_analytics.
+/boomerang.js
 /boost_stats.
 /botd.gif?
 /br-trk.
@@ -1240,6 +1239,7 @@ _empty.ad?
 _googleAnalytics_
 _NielsenNetRatings.
 _onedot?
+_pixelmap.js
 _promo_id=
 _quantcast.swf
 _sdctag1_
@@ -1333,6 +1333,7 @@ size=1x1;
 /browser.js?eid=$domain=cheapflights.com
 /msftaudience.
 ||4info.com/alert/listeners/
+||accuterm.com/data/stat.js
 ||activity.frequency.com^
 ||addresses.com/track_event.
 ||adf.ly/omnigy*.swf
@@ -1363,7 +1364,6 @@ size=1x1;
 ||bc.yahoo.com/b?P=
 ||beacon.search.yahoo.com^
 ||betanews.com/track?
-||accuterm.com/data/stat.js
 ||betway.com/snowflake/?
 ||bi.medscape.com^
 ||bing.com/fd/ls/l?
@@ -1889,7 +1889,6 @@ size=1x1;
 ||customerdiscoverytrack.com^
 ||cya1t.net^
 ||d1ivexoxmp59q7.cloudfront.net^
-||log1.survey.io^
 ||d1nu2rn22elx8m.cloudfront.net^
 ||d1qpxk1wfeh8v1.cloudfront.net^
 ||d2n8p8eh14pae1.cloudfront.net^
@@ -2127,6 +2126,7 @@ size=1x1;
 ||lloogg.com^
 ||log.go.com^
 ||log.kibboko.com^
+||log1.survey.io^
 ||logdy.com^
 ||longtailvideo.com^*/gapro-1.
 ||lookery.com^
diff --git a/opera/urlfilter-stats.ini b/opera/urlfilter-stats.ini
index 16b315909..bd4ff4007 100644
--- a/opera/urlfilter-stats.ini
+++ b/opera/urlfilter-stats.ini
@@ -28,6 +28,7 @@
 *.a013.com/*
 *.a8ww.net/*
 *.accessintel.*
+*.accuterm.com/data/stat.js
 *.acecounter.*
 *.acetrk.com/*
 *.active-tracking.*
@@ -1120,6 +1121,7 @@
 */bm-analytics/*
 */bm-bam-trk.*
 */bn_analytics.*
+*/boomerang.js
 */boost_stats.*
 */botd.gif?*
 */br-trk.*
@@ -2155,16 +2157,13 @@
 *_247seotracking.*
 *_adcenterconversion.*
 *_check.php?referer*
-*/boomerang.js
 *_clicktrack.asp?*
 *_ComScore.*
-*_pixelmap.js*
-http://log1.survey.io/*
-*.accuterm.com/data/stat.js
 *_CoreMetrics/*
 *_empty.ad?*
 *_NielsenNetRatings.*
 *_onedot?*
+*_pixelmap.js*
 *_promo_id=*
 *_quantcast.swf
 *_sdctag1_*
@@ -2385,6 +2384,7 @@ http://livestat.*
 http://log.go.com/*
 http://log.kibboko.com/*
 http://log1.music.yahoo.com/*
+http://log1.survey.io/*
 http://log2.vitalmedianet.com/*
 http://logger.*
 http://logping.*
diff --git a/opera/urlfilter.ini b/opera/urlfilter.ini
index e14a65877..2e0cb866a 100644
--- a/opera/urlfilter.ini
+++ b/opera/urlfilter.ini
@@ -1,5 +1,5 @@
 # Fanboy's Adblock list (Opera)
-# Checksum: w3AE/2RQ0RZPQxs4ssouRg
+# Checksum: ePUUlvk1aInjQB566jAeRQ
 # Updated: 15 Apr 2011
 # License: http://creativecommons.org/licenses/by/3.0/
 # Email: fanboyadblock@googlegroups.com Project homepage: http://fanboy.co.nz/
@@ -150,7 +150,6 @@ prioritize excludelist=1
 *.adlandpro.*
 *.adlegend.*
 *.adlegend.com/*
-*/AdRollPixel.*
 *.adlink.net/*
 *.adman.gr/*
 *.admanage.com/*
@@ -1359,6 +1358,7 @@ prioritize excludelist=1
 *.ucoz.net/popup/*
 *.uff5.to/*
 *.ugo.com/takeover/*
+*.ultimate-guitar.com/_img/takeover/*
 *.unicast.com/*
 *.upsellit.com/custom/*
 *.urlcash*.gif
@@ -1368,7 +1368,6 @@ prioritize excludelist=1
 *.ussearch.com/preview/banner/*
 *.utarget.co.uk/*
 *.uvnc.com/img/housecall.*
-*.ultimate-guitar.com/_img/takeover/*
 *.validclick.*
 *.valuead.*
 *.valueclick.*
@@ -1822,6 +1821,7 @@ prioritize excludelist=1
 */adrevolver/*
 */adriver.*
 */AdRobot.*
+*/AdRollPixel.*
 */adroot/*
 */adrot.js
 */adrotate/*