Merge branch 'master' of linz:/srv/git/git-kairo
authorRobert Kaiser <kairo@kairo.at>
Tue, 23 Jun 2015 20:32:53 +0000 (22:32 +0200)
committerRobert Kaiser <kairo@kairo.at>
Tue, 23 Jun 2015 20:32:53 +0000 (22:32 +0200)
1  2 
testbed/ua_list_raw.txt

Simple merge