Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 9 Sep 2014 15:11:49 +0000 (15:11 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 9 Sep 2014 15:11:49 +0000 (15:11 +0000)

Trivial merge