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

diff --combined testbed/ua_list_raw.txt
index ef48d580728ba0a19fe8a9190ed3f2bc74122b55,4ba4102074bd6baa0657cc5054ce14d6e3d04145..16b906e45830f083d44249e58c716c3fc9d88d82
--- 1/testbed/ua_list_raw.txt
--- 2/testbed/ua_list_raw.txt
+++ b/testbed/ua_list_raw.txt
@@@ -58,7 -58,6 +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
@@@ -188,6 -187,7 +188,7 @@@ Mozilla/5.0 (Macintosh; U; Intel Mac O
  Mozilla/5.0 (iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10
  Mozilla/5.0 (iPod; U; CPU iPhone OS 4_3_3 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5
  Mozilla/5.0 (iPhone; CPU iPhone OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3
+ Mozilla/5.0 (iPhone; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) FxiOS/1.0 Mobile/12F69 Safari/600.1.4
  Mozilla/5.0 (Linux; U; Android 2.1-update1; de-de; HTC Desire 1.19.161.5 Build/ERE27) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17
  Mozilla/5.0 (Linux; U; Android 2.2.1; fr-ch; A43 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
  Mozilla/5.0 (BlackBerry; U; BlackBerry 9860; en-GB) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.0.0.296 Mobile Safari/534.11+