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
Merge pull request #1176 from annando/1409-diaspora-repeated-twitter-cleanup

1409 diaspora repeated twitter cleanup