From ca272031e72dc64923bd6a94c124f35fdb816f59 Mon Sep 17 00:00:00 2001
From: Jasper Abbink <github@jabbink.nl>
Date: Mon, 14 Apr 2014 11:53:25 +0200
Subject: [PATCH] Merge

---
 share/apps.json | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/share/apps.json b/share/apps.json
index d931b416c..83b2abf90 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -787,6 +787,12 @@
 			"meta": { "generator": "Doxygen ([\\d.]+)\\;version:\\1" },
 			"html": "(?:<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
 		},
+		"DTG": {
+			"website": "www.dtg.nl",
+			"cats": [ 1 ],
+			"html": [ "<a href=\"http://www\\.dtg\\.nl/\" target=\"_blank\" rel=\"nofollow\" id=\"poweredBy\" title=\"Site Powered by DTG\">Site Powered by DTG</a>", "var u=\\(\\('https:' == d\\.location\\.protocol\\) \\? 'https://resellerstat\\.mono\\.net/dtg/' : 'http://resellerstat\\.mono\\.net/dtg/'\\);" ],
+			"implies": "Mono.net"
+		},
 		"DreamWeaver": {
 			"website": "www.adobe.com/products/dreamweaver",
 			"cats": [ 20 ],
@@ -1656,6 +1662,16 @@
 			"cats": [ 27 ],
 			"headers": { "X-Powered-By": "\\bLua(?: ([\\d.]+))?\\;version:\\1" }
 		},
+		"M.R. Inc Webserver": {
+			"website": "mrincworld.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "M\\.R\\. Inc Inc Webserver" }
+		},
+		"M.R. Inc Wild CMS": {
+			"website": "mrincworld.com",
+			"cats": [ 1, 6 ],
+			"headers": { "X-Powered-By": "M\\.R\\. Inc Inc Wild CMS" }
+		},
 		"Magento": {
 			"website": "www.magentocommerce.com",
 			"cats": [ 6 ],
@@ -1881,6 +1897,14 @@
 			"cats": [ 18 ],
 			"headers": { "X-Powered-By": "Mono" }
 		},
+		"Mono.net": {
+			"website": "www.mono.net",
+			"cats": [ 1 ],
+			"script": "monotracker\\.js",
+			"env": "_monoTracker",
+			"html": "var u=\\(\\('https:' == d\\.location\\.protocol\\) \\? 'https://resellerstat\\.mono\\.net/mono/' : 'http://resellerstat\\.mono\\.net/mono/'\\);",
+			"implies": "Piwik"
+		},
 		"Moodle": {
 			"website": "moodle.org",
 			"cats": [ 21 ],
@@ -1905,16 +1929,6 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "Movable Type" }
 		},
-		"M.R. Inc Webserver": {
-			"website": "mrincworld.com",
-			"cats": [ 22 ],
-			"headers": { "Server": "M\\.R\\. Inc Inc Webserver" }
-		},
-		"M.R. Inc Wild CMS": {
-			"website": "mrincworld.com",
-			"cats": [ 1, 6 ],
-			"headers": { "X-Powered-By": "M\\.R\\. Inc Inc Wild CMS" }
-		},
 		"Mura CMS": {
 			"website": "www.getmura.com",
 			"cats": [ 1, 11 ],
@@ -2581,13 +2595,6 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "SiteEdit" }
 		},
-		"Skimlinks": {
-			"website": "skimlinks.com",
-			"cats": [ 36 ],
-			"script": "^https?://(?:[^/]+\\.)?skimresources\\.com/",
-			"html": "<a [^>]*href=\"https?://go\\.redirectingat\\.com/",
-			"env": "^skim(?:links|words)_"
-		},
 		"Smart Ad Server": {
 			"website": "smartadserver.com",
 			"cats": [ 36 ],