Resolve merge conflict in PR #359#364

marmarek wants to merge 2 commits into

QubesOS:mainQubesOS/qubes-core-admin-client:mainfrom

marmarek:pr-359-mergemarmarek/qubes-core-admin-client:pr-359-mergeCopy head branch name to clipboard