Fixed bug#10163, thanks to S7designcreative.
Updated Latin Serbian translation, thanks to S7designcreative.
Updated Cyrillic Serbian translation, thanks to S7designcreative.
Fixed: ACLListGet() produces DB warning message. (bug#10535).
Fixed some typos in variable names, POD and error messages.
remove comments at the first place to avoid to much work for the regex engine (ToAscii)
Fixed displaying of action row in ticket previews after performance optimizations.
Added missing config documentation for ForeignDB setting.
Fixed: Merging a watched ticket _into_ another should "transfer" the Watch status to the final ticket (thanks to Michiel Beien!) (bug#5012).
Squashed commit of the following:

commit fe91ef440624b4037106e4f037457c67af3a6f03
Author: Michiel Beijen <michiel.beijen@otrs.com>
Date:   Tue May 20 17:31:07 2014 +0000

    Changes by otrscodepolicy script.

commit 2d510bf81ef9f28c24978304a5a82696dfd03b6c
Author: Michiel Beijen <michiel.beijen@otrs.com>
Date:   Mon Nov 18 20:20:31 2013 +0100

    Transfer watch status when merging tickets.

    This fixes bug#5012 - http://bugs.otrs.org/show_bug.cgi?id=5012

commit 8cae3b6ad16e73e8a703cf14fd93967710be99dd
Author: Michiel Beijen <michiel.beijen@otrs.com>
Date:   Mon Nov 18 17:39:56 2013 +0100

    Moved Watcher tests to separate file.

Conflicts:
	CHANGES.md
	scripts/test/Ticket.t
Merge branch 'typos-msgs' of github.com:mbeijen/otrs-1
Fixed: backup.pl doesn't work with PostgreSQL unix sockets (bug#10430).
Squashed commit of the following:

commit 2dc7f59a560fa595c537f4a3c8eeda1591549549
Author: s7design <otrs@s7designcreative.com>
Date:   Tue May 20 16:41:04 2014 +0200

    Changed backup.pl and restore.pl for PostrgreSQL when it is used unix socket
Textual changes: Display the current activity name instead of generic text for next activity dialogs.
Fixed: OutputFilterText AutoLink CVE (bug#10521).
Squashed commit of the following:

commit 9e53d226b1a5ed5c5949a3264886300bda066e3c
Author: s7design <otrs@s7designcreative.com>
Date:   Tue Jun 3 01:58:01 2014 +0200

    http://bugs.otrs.org/show_bug.cgi?id=10521

    Changed regex for CVE, added test_mail for it
Merge branch 'reneeb_htmlutils_remove_htmlcomments' of github.com:reneeb/otrs
Fixed bug#10549 - SelectAllCheckboxes doesn't work as expected.
Updated CHANGES file.
Added missing translation.

Conflicts:
	Kernel/Output/HTML/Standard/AAABase.dtl
Merge remote-tracking branch 'upstream/master'