Added TempDir function to FileTemp object.
Update otrs.ArticleStorageSwitch.pl

Deleted debugging code from lines 94 and 95 which causes the script to die
add NoOutOffice parameter. When this is set, the 'out of office' message is not appended in the userlist.
factor _UserFullname out to avoid lots of sql queries when UserList is called
use defined-or operator
avoid duplicated code
use correct index in data array
add tests for new _UserFullname method
Merge branch 'reneeb_user_fullname' of github.com:reneeb/otrs
POD typo.
Merge branch 'reneeb_user_minor_optimization' of github.com:reneeb/otrs
Merge branch 'reneeb_userlist_sql' of github.com:reneeb/otrs
Merge branch 'patch-2' of github.com:jensoliver/otrs
Merge branch 'tempdir' of github.com:mbeijen/otrs-1
Fixed: Bulk action locks tickets - cancel keeps them locked (bug#10427).
Squashed commit of the following:

commit 59b772d2309ce86d84bb29eb01eb119972f2768d
Author: s7design <otrs@s7designcreative.com>
Date:   Tue May 13 09:49:18 2014 +0200

    Bulk action locks tickets - cancel keeps them locked for master branch.

commit f81bb411d94f9e7efd9a027b1bd9aa577703c4ff
Merge: 7c3da97 0d47cea
Author: root <root@ubuntu.(none)>
Date:   Tue May 13 08:57:05 2014 +0200

    Merge remote-tracking branch 'upstream/master'

commit 7c3da97f73a05220c6d19e1b3040c0f7de150487
Merge: e91f08c 28edf16
Author: root <root@ubuntu.(none)>
Date:   Thu May 8 10:35:03 2014 +0200

    Merge remote-tracking branch 'upstream/master'

commit e91f08c68e2edf8bee4db8c3b0f4e7bb7f779927
Merge: ed48673 ac11e06
Author: root <root@ubuntu.(none)>
Date:   Tue Apr 22 15:14:15 2014 +0200

    Merge remote-tracking branch 'upstream/master'

commit ed4867380eb6ae5c020012c1eab3df97a3c592d3
Merge: f0fb989 f811c78
Author: root <root@ubuntu.(none)>
Date:   Tue Apr 22 11:32:23 2014 +0200

    Merge remote-tracking branch 'upstream/master'

commit f0fb989ba1fd4c835ab8bd0469082bf3712e3041
Merge: f4c6945 155f17c
Author: root <root@ubuntu.(none)>
Date:   Tue Apr 15 12:56:32 2014 +0200

    Merge remote-tracking branch 'upstream/master'

commit f4c69450304ed5d8c528ab9a942bc4b3ce98ae39
Merge: 048f401 4dce8c3
Author: root <root@ubuntu.(none)>
Date:   Fri Apr 11 15:57:43 2014 +0200

    Merge remote-tracking branch 'upstream/master'

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.
Added support for HTTP basic auth in WebUserAgent, thanks to Renée Bäcker.
Tidied.
Detect cookie capability before login, thanks to Moritz Lenz.
Added merging of dynamic fields on ticket merge, thanks to Moritz Lenz.
Squashed commit of the following:

commit 62d77332c8108ccf28901b61611e81026de7cbf8
Author: Moritz Lenz <mlenz@noris.net>
Date:   Fri Mar 7 16:11:36 2014 +0100

    Implement merging of dynamic fields on ticket merge

    For a list of configured dynamic fields, in case of a ticket merge,
    the value from the merge ticket is copied into the main ticket if
    the main ticket has no value set.

commit 93fb652084274bc1385cde11464e6186b75027c7
Author: Moritz Lenz <mlenz@noris.net>
Date:   Sun Mar 9 08:37:15 2014 +0100

    Fixup config
Added: unlock ticket if owner is away, thanks to Moritz Lenz.
Squashed commit of the following:

commit c633f45c84a0f0ef865b2b77192c929c00f4105a
Author: Moritz Lenz <mlenz@noris.net>
Date:   Fri Mar 7 08:57:00 2014 +0100

    use UnlockOnAway in AgentTicketActionCommon and AgentTicketPhoneCommon

commit 2b778219bc722b0659a7f59f344b773a4d07db32
Author: Moritz Lenz <mlenz@noris.net>
Date:   Thu Mar 6 20:55:13 2014 +0100

    Use Object Manager in Ticket object constructor

    Avoids having two User objects, which could have inconsistent caches,
    and makes the new tests pass.

commit d385cfa067655f689febe9d7e8a2f9cf8346e6d4
Author: Moritz Lenz <mlenz@noris.net>
Date:   Thu Mar 6 20:17:16 2014 +0100

    Unlock Tickets on Article creation if the Owner is out of office

    Adds the backend logic and configuration