tree ed1c4972447a4262db328a91e50a55bdf454b776
parent 3b2babb97e4cb7ad3e5499682d5bb53ffbb93862
parent 964d2debcfbc2ebbef499cbb31ede9221ef180e1
author Michael Kutý <6du1ro.n@gmail.com> 1448884273 +0100
committer Michael Kutý <6du1ro.n@gmail.com> 1448884273 +0100

Merge branch 'hotfix/helpdesk_timeout' into master-2