Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 20 Oct 2014 12:05:09 +0000 (14:05 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 20 Oct 2014 12:05:09 +0000 (14:05 +0200)

Trivial merge