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 1716) Refactor synmerge logic into own function
(Bug 1716) Duplicate feed/feed merging backend
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 4839) Fix border on header when no page bg is set
(Bug 4839) Fix border on footer when no page bg is set
(Bug 4756) Copy images from sundaymorning to planetcaravan folder
Merge pull request #413 from momijizukamori/Bug4839/LibrariansDreamHeaderBorder

(Bug 4839) Fix border on header when no page bg is set
(Bug 1716) Remove missed ::Dumper call, escape stuff
Merge pull request #410 from anall/feature/Bug1716-Admin

Admin 'frontend' for fuzzy feed matching
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=5023

Fixed an extra character that somehow crept in.