tree e06648569e1a64009d1e937f9f014d110e3cadda
parent 0954ee64d8d53e715748155825435b42e3cabcdc
parent 8951b30824c0b1041d12b93b402cee3b8f533e0a
author Michael Kutý <6du1ro.n@gmail.com> 1448892297 +0100
committer Michael Kutý <6du1ro.n@gmail.com> 1448892297 +0100

Merge branch 'hotfix/helpdesk' into master-2