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
Bumping Rails version
Merge pull request #1096 from elzj/rails_3020

Bumping Rails version
Force Twitter share to open in new window
Merge pull request #1097 from sarken/issue_3271

3271 Force Tumblr share to open in new window
Remove blank line so it would look better on LJ/DW.
Merge pull request #1098 from sarken/issue_3271

3271 Remove blank line so share would look better on LJ/DW.
Merge branch 'master' into deploy