Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws

diff --cc test/widgets/url.koha
index 2ff6029,330cbb9..4000742
--- 1/test/widgets/url.koha
--- 2/test/widgets/url.koha
+++ b/test/widgets/url.koha
@@@ -1,7 -1,5 +1,5 @@@
  http://cph.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
  http://demo.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
 -http://demo.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi2
 +http://demo.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi3
  http://boston.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
- http://example.indexdata.com/topic.html?q=sushi
- http://example.indexdata.com/simple.html
- 
+ http://cph.koha.indexdata.com/cgi-bin/koha/opac-mkws.pl?q=sushi&t=connect.indexdata.com:9000/flickr_api