Merge branch 'master' of linz:/srv/git/git-kairo

diff --combined testbed/ua_list_raw.txt
index 1bbb40cb217aad7be8045319840a808dd993fea3,16b906e45830f083d44249e58c716c3fc9d88d82..00b1c6aa08ab56780433e0281d69396533bd1d5e
--- 1/testbed/ua_list_raw.txt
--- 2/testbed/ua_list_raw.txt
+++ b/testbed/ua_list_raw.txt
@@@ -58,6 -58,7 +58,7 @@@ Mozilla/5.0 (X11; Linux x86_64; rv:20.0
  Mozilla/5.0 (Android; Mobile; rv:12.0) Gecko/12.0 Firefox/12.0
  Mozilla/5.0 (Android; Tablet; rv:14.0a1) Gecko/14 Firefox/14.0a1
  Mozilla/5.0 (Android; Tablet; rv:28.0) Gecko/28.0 Firefox/28.0
+ Mozilla/5.0 (Android 4.4; Mobile; rv:36.0) Gecko/36.0 Firefox/36.0'
  Mozilla/5.0 (Android; rv:20.0) Gecko/20.0 Firefox/20.0
  Mozilla/5.0 (Android; Linux armv7l; rv:2.0.1) Gecko/20100101 Firefox/4.0.1 Fennec/2.0.1
  Mozilla/5.0 (Android; Linux armv7l; rv:2.0b6pre) Gecko/20100907 Firefox/4.0b6pre Fennec/2.0b1pre
@@@ -117,7 -118,6 +118,7 @@@ Mozilla/5.0 (X11; U; Linux i686) Gecko/
  Mozilla/5.0 Galeon/1.2.7 (X11; Linux i686; U;) Gecko/20021204
  Galeon/1.3.7 (IE4 compatible; I; Windows XP) Galeon/1.3.7 Debian/1.3.7.20030803-1
  Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0
 +Mozilla/5.0 (Windows Phone 10; Android 4.2.1; Microsoft; NOKIA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.143 Mobile Safari/537.36 Edge/12.0
  Microsoft Internet Explorer/4.0b1 (Windows 95)
  Mozilla/1.22 (compatible; MSIE 1.5; Windows NT)
  Mozilla/2.0 (compatible; MSIE 3.01; Windows 95)