http://bugs.dwscoalition.org/show_bug.cgi?id=4927

Added a More Options button to the comment preview page which uses jQuery to redirect to
mode=reply or reply=to.
http://bugs.dwscoalition.org/show_bug.cgi?id=5023

Altered text on the Manage Tags page for clarity.
Merged from remote branch.
Conflicts:
	htdocs/manage/tags.bml.text
Bug 2114: apply patch from LiveJournal r15922

This is LJ's patch for fixing the previous/next issue.  It looks
like the relevant code has not changed on our end, so I applied it
directly, only tweaking whitespace to match our style guidelines.

THIS IS NOT TESTED.  Please test before committing!
Bug 2114: remove unused variable $cmp2

I noticed that the previous changes cause this $cmp2 variable to be
assigned but not used, so I removed the declaration and assignments.

(Still not tested!)
(Bug 4756) 19 themes for Planet Caravan by rising
(Bug 4613) 22 themes for Abstractia by nornoriel
(Bug 4756) Copy images from sundaymorning to planetcaravan folder
Merge pull request #412 from momijizukamori/Bug4613/AbstractiaThemes

(Bug 4613) 22 themes for Abstractia by nornoriel
Merge pull request #414 from momijizukamori/Bug5756/PlanetCaravanThemes

Bug4756/planet caravan themes
http://bugs.dwscoalition.org/show_bug.cgi?id=5023

Added new translation string and updated the Manage Tags page
accordingly.
(Bug 5085) Stringify the error object from template toolkit

So that our own exception handling will know what to do with it.
Merge pull request #415 from afuna/scrutable-error-bug5085

(Bug 5085) Stringify the error object from template toolkit
Merge pull request #411 from kareila/bug2114-20130607a

Bug2114 20130607a
http://bugs.dwscoalition.org/show_bug.cgi?id=4927

Added the "More Options" button to the comment preview page with jQuery
as well as making the functionality. Also edited Talk.pm to resolve a
bug in my original code that made this break unless you came to the
preview page via QuickReply.

Additional stuff: removed a sexist joke from the comments in S2.pm and
added "fixme" comments to viewing_style_args and viewing_style_opts in
Web.pm as these need to be modernised (as advised by Rah).
(Bug 4571) Keep icon from overlapping on small text size in Bannering
http://bugs.dwscoalition.org/show_bug.cgi?id=5023

Fixed an extra character that somehow crept in.
Merge pull request #406 from lucymclaughlin/5023-tag-settings-text

http://bugs.dwscoalition.org/show_bug.cgi?id=5023
(Bug 3483) Add entry slug functionality

Note: this only works on the new update page. ;-)

This gives users the ability to specify a pretty URL for their entry,
which is then used in most places on the site. The old style URLs still
work, and short URLs can be updated at will.
http://bugs.dwscoalition.org/show_bug.cgi?id=4927

Removed some logs and moved the More Options button.
http://bugs.dwscoalition.org/show_bug.cgi?id=4927

Changed $basepath to use the entry's url method rather than building the
link directly with the item id to make the link compatible with pretty
URLs (see bug 5087).