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
Issue 1143: Switching back tag sorting, setting initial values for media tags
Merge pull request #1087 from elzj/fandom_sorting_fix

Issue 1143: Switching back tag sorting, setting initial values for media
Make sure we're only logging admin activity
Merge pull request #1088 from elzj/bot_logging_fix

Issue 3480: Make sure we're only logging admin activity
3491 remove livevalidation from change username form
Merge pull request #1089 from sarken/issue_3491

3491 remove livevalidation from change username form
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