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

Trivial merge