Diaspora: Repeated items from twitter to Diaspora now only include a link, since Diaspora is showing the whole tweet.
Merge remote-tracking branch 'upstream/master' into 1409-diaspora-repeated-twitter-cleanup
Creating hashtags from keywords of a feed, when additional data should be fetched.
Created hashtags from keywords now are links. URL are cleaned from tracking data.
Merge pull request #1176 from annando/1409-diaspora-repeated-twitter-cleanup

1409 diaspora repeated twitter cleanup
Merge pull request #1177 from annando/1410-feed-with-tags

Importing feed with hashtags from keywords
Merge pull request #1175 from fabrixxm/master

Friendica 'Ginger' 3.3
use noscrape by default, add opt-out option to disable it
Merge pull request #1187 from tobiasd/20141013

noscrape by default