# HG changeset patch
# User heinrichsweikamp <bitbucket@heinrichsweikamp.com>
# Date 1570604923 0
# Node ID 5f46ec49f9bf28e4ce1eabff5fa9c511b7326b51
# Parent  ba53ab77f059251e3e2777b48e7a59324ab0d344# Parent  9c8e2e962f55b233c1b6a91635a31b4fcd24eb26
Merged in janlmulder/ostc4/fix-merge-mess (pull request #33)

Fix merge mess, and add tag