Add tweet_id column to post
Twitter service removes status from twitter when post is revoked
Fix dispatcher_spec to depend on Tumblr which isn't retracting
Service.delete_post now more generic, for future implementations

Service.delete_post now accepts post to be more generic and supports deleting post from any service that overrides delete_post(post)
Fix #4157: post preview from tag pages
drop fallback donation form
Merge pull request #4177 from svbergerem/4157-post-preview-tag-page

Fix #4157: post preview from tag pages
Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop

Conflicts:
	Changelog.md
bump redcarpet, should fix #4104
strip trailing newlines from stripped markdown
Fix tags ordering in chrome
Merge pull request #4133 from diaspora/fix_tags_ordering

Fix tags ordering in chrome
Fix post iframe src url

Add test for posts helper
Fix icons-deletelabel styles
Merge pull request #4186 from marpo60/fix_issue_4180_deletelabel_after_sprites

Fix icons-deletelabel styles
remove ["a", "b", "C"] from the void of nothingness [wtf]
add failing spec for #4160
extend the spec a bit more
refactor mention handling in a status message