Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 24 Oct 2014 09:58:44 +0000 (09:58 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 24 Oct 2014 09:58:44 +0000 (09:58 +0000)

Trivial merge