Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 17 Dec 2014 10:26:46 +0000 (10:26 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 17 Dec 2014 10:26:46 +0000 (10:26 +0000)

Trivial merge