Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 27 Jul 2015 13:32:54 +0000 (13:32 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 27 Jul 2015 13:32:54 +0000 (13:32 +0000)

Trivial merge