Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 4 Jun 2015 08:26:16 +0000 (08:26 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 4 Jun 2015 08:26:16 +0000 (08:26 +0000)

Trivial merge