Tumblr share option
Add line breaks to embed code
Update share boxes in views
Add br tags to the share code and add Tumblr sharing AND break the mailers, oops
Remove comment
Deprecation fix: replacing & with merge for relation merging
Merge pull request #1090 from elzj/merge_deprecation_fix

Deprecation fix: replacing & with merge for relation merging
Resolve merge conflicts with Twitter button
Fix unpack error with concatenated string
Merge pull request #1055 from sarken/issue_3271

3271, 3441 fix share HTML, add Tumblr share, add Additional Tags to share