uses should be at the top of the file
fix a typo
Fix perldoc typos
Merge branch 'reneeb_article_check_pgp_uses' of github.com:reneeb/otrs
Merge branch 'reneeb_article_check_pgp_typos' of github.com:reneeb/otrs
Follow symlinks when setting file permissions.

Squashed commit of the following:

commit b76f854da84753db7e5a855d6aa89f2a958cc69f
Author: Thorsten Eckel <te@znuny.com>
Date:   Tue Mar 25 09:46:25 2014 +0100

    Updated usage info.

commit 2e15beb31cf4ddea07f39cc4343465f0153cc482
Author: Thorsten Eckel <te@znuny.com>
Date:   Tue Mar 25 09:44:17 2014 +0100

    Added parameter to follow symlinks.
Ignore .git directory in otrs.SetPermissions.pl.
Fixed: Customer Information in AgentTicketZoom (bug#10425).
Squashed commit of the following:

commit 7a10c2486e7563344a52886ec8ff6a23757ceac4
Author: s7design <otrs@s7designcreative.com>
Date:   Thu Apr 3 16:00:19 2014 +0200

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

    Changed block data  for Customer Info for OTRS 3.4

commit 048f401be5dd9b1c4f73c67644fb81f81a93bbc1
Merge: 7da2cc6 1615ab6
Author: root <root@ubuntu.(none)>
Date:   Thu Apr 3 14:29:39 2014 +0200

    Merge remote-tracking branch 'upstream/master'

commit 7da2cc611739cd85058e1f81bb7b24538e2e71a9
Merge: 8ee1637 7c2ffb2
Author: root <root@ubuntu.(none)>
Date:   Wed Apr 2 16:36:58 2014 +0200

    Merge remote-tracking branch 'upstream/master'

commit 8ee1637398cc1037277e842756d2ac5eeac6efdc
Merge: 8706657 41b735f
Author: root <root@ubuntu.(none)>
Date:   Tue Apr 1 14:35:54 2014 +0200

    Merge remote-tracking branch 'upstream/master'

commit 870665735a3f4380b437052d136bf102e87a5449
Merge: 001c073 a4e45a0
Author: root <root@ubuntu.(none)>
Date:   Tue Apr 1 09:22:16 2014 +0200

    Merge remote-tracking branch 'upstream/master'

commit 001c073637703e92f125eff0cd8a30d5fbd996a6
Author: s7design <otrs@s7designcreative.com>
Date:   Fri Mar 28 08:54:23 2014 +0100

    back to original version in master brench

commit ff1ee37d205c849e94315a069beeddcb2e062165
Merge: aff6dbb a7a2d13
Author: root <root@ubuntu.(none)>
Date:   Thu Mar 27 16:32:26 2014 +0100

    Merge remote-tracking branch 'upstream/master'

commit aff6dbb28f9c815ced086fc2846c41c87b36992a
Author: s7design <otrs@s7designcreative.com>
Date:   Wed Mar 26 17:35:46 2014 +0100

    [Bug 10320] PostMaster Filter // possibility to Set more Email Headers
    Changed the logic in the .tt file to not duplicate the code for every
    field. Now, the fields are created in loop.
Fixed: Missing Note and NoteMandatory options for AgentTicketMove (bug#10371).
Squashed commit of the following:

commit 1f69805b8fceb2f72da49f91570e6425301dcdaf
Author: Martin Gruner <martin.gruner@otrs.com>
Date:   Fri Apr 4 15:38:04 2014 +0200

    Small fix.

commit 58c67d15feb698ae2cfe8f124e1dd72721bb3cc9
Merge: 424f087 246aab5
Author: Martin Gruner <martin.gruner@otrs.com>
Date:   Fri Apr 4 15:34:13 2014 +0200

    Merge branch 'master_bug_#10371' of github.com:s7design/otrs into s7design-master_bug_#10371

commit 246aab571e9835738e598ac1ede195052b224e9f
Author: s7design <otrs@s7designcreative.com>
Date:   Fri Apr 4 15:03:03 2014 +0200

    Fixed mistake in code

commit 086abc0e39de53af1915b401d26ed5920da22f26
Author: s7design <otrs@s7designcreative.com>
Date:   Tue Apr 1 16:22:46 2014 +0200

    changed the mistake from previous commit

commit 6f22de924fe4752414479a65f2c2ae1ad2aa3156
Author: s7design <otrs@s7designcreative.com>
Date:   Tue Apr 1 16:18:04 2014 +0200

    [Bug 10371] Missing Note and NoteMandatory options for AgentTicketMove

    Added config item for Note in frontend module AgentTicketMove. It Allows adding notes in the ticket free text screen of the agent interface

commit 8ee1637398cc1037277e842756d2ac5eeac6efdc
Merge: 8706657 41b735f
Author: root <root@ubuntu.(none)>
Date:   Tue Apr 1 14:35:54 2014 +0200

    Merge remote-tracking branch 'upstream/master'

commit 870665735a3f4380b437052d136bf102e87a5449
Merge: 001c073 a4e45a0
Author: root <root@ubuntu.(none)>
Date:   Tue Apr 1 09:22:16 2014 +0200

    Merge remote-tracking branch 'upstream/master'

commit 001c073637703e92f125eff0cd8a30d5fbd996a6
Author: s7design <otrs@s7designcreative.com>
Date:   Fri Mar 28 08:54:23 2014 +0100

    back to original version in master brench

commit ff1ee37d205c849e94315a069beeddcb2e062165
Merge: aff6dbb a7a2d13
Author: root <root@ubuntu.(none)>
Date:   Thu Mar 27 16:32:26 2014 +0100

    Merge remote-tracking branch 'upstream/master'

commit aff6dbb28f9c815ced086fc2846c41c87b36992a
Author: s7design <otrs@s7designcreative.com>
Date:   Wed Mar 26 17:35:46 2014 +0100

    [Bug 10320] PostMaster Filter // possibility to Set more Email Headers
    Changed the logic in the .tt file to not duplicate the code for every
    field. Now, the fields are created in loop.
Fixed unit test.
Fixed: Strange sorting of columns in Ticket Dashboard widgets (bug#10438).

Squashed commit of the following:

commit bad67bbc8136041540b7841cc31432505a63e6ae
Merge: 1ddbc18 59c85a7
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Fri Apr 4 16:57:07 2014 -0600

    Merge branch 'rel-3_3-b4' of github.com:noritnk/otrs into noritnk-rel-3_3-b4

commit 59c85a7c991c89cd330b8b9127265645597fc104
Author: Norihiro Tanaka <noritnk@kcn.ne.jp>
Date:   Thu Feb 27 23:23:14 2014 +0900

    Define default column order in DashboardTicketGeneric.
Fixed: Error message in syslog about ACL then there is no ACL defined (bug#10436).
Merge remote-tracking branch 'upstream/master'