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

Trivial merge