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

Trivial merge