Clear up phantom kudos situation and make them ajaxy
Issue 2817: keep inbox filters after mass actions on inbox comments
Argh the comments controller argh

(Redirect to the tag's to_param rather than name, whenever the comment is on a tag.)

Issue 3748  Pagination not working on Wrangling comment pages
http://code.google.com/p/otwarchive/issues/detail?id=3748
This just disables the unwrangleable ticky for unsorted tags
This prevents the unwrangleable for being saved on an unsorted tag, as server side validation
What is this? Is it a courgette? Is it a tomato? No, it's a cucumber!
Change mass-wrangle bins default search-order to sort by created date, ascending
Issue 2560 - redirect after removing wrangling assignment

Redirect to the same filtered choice of wrangler / media / fandom after removing a wrangling assignment
Issue 3757: send comments on synned fandoms to wranglers of the canonical
Removes the deprecated invocation of the text format for mailers
Merge branch 'refs/heads/master' into 0.9.11-issue-3254-nonunwrangleable

Conflicts:
	app/views/tags/edit.html.erb
Merge branch 'refs/heads/master' into 0.9.11-phantom_kudos-Elz

Conflicts:
	app/controllers/kudos_controller.rb
	app/views/comments/_commentable.html.erb
	public/javascripts/application.js
3780 Close a div tag on the splash page
skin changes: ensure type selection is persisted; allow changing type during creation
Merge branch 'refs/heads/master' into 0.9.11-issue-2560-filtering-wranglings
Merge branch 'refs/heads/master' into 0.9.11-issue-2817-keep-inbox-filters
Merge branch 'refs/heads/master' into 0.9.11-issue-3254-nonunwrangleable
Merge branch 'refs/heads/master' into 0.9.11-issue-3723-mass-wrangle-order
Merge branch 'refs/heads/master' into 0.9.11-issue-3748-pagination-tag-comments-weird-charas
Merge branch 'refs/heads/master' into 0.9.11-issue-3757-fandom-comments