Merge branch 'master' of gitlab.com:delkappa/delkappa

This commit is contained in:
2017-10-30 16:39:50 +01:00