Moving tweet text to a helper method
Issue 1143: Make it possible to sort tags alphabetically without articles
Issue 2130: only list user fandoms for non-anonymous works
Issue 3472: Orphaned comments should have their cache expired
Upgrading Rails, switching nested_has_many_through to the gem version
Merge pull request #1064 from elzj/rails_upgrade

Upgrading Rails, switching nested_has_many_through to the gem version
Merge pull request #1059 from elzj/issue_3472_orphaned_comments

Issue 3472: Orphaned comments should have their cache expired
Merge pull request #1047 from elzj/issue_2130_anon_fandoms

Issue 2130: only list user fandoms for non-anonymous works
Merge pull request #927 from elzj/tweet_text

Moving tweet text to a helper method
Issue 1143: Make it possible to sort tags alphabetically without articles
Resolving merge conflict
Merge pull request #1008 from elzj/issue_1143_ignore_articles

Issue 1143: Make it possible to sort tags without articles
Merge branch 'master' of git://github.com/otwcode/otwarchive