Merge branch 'wosch' of ssh://git.indexdata.com:222/home/git/private/mkws into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 7 Apr 2014 16:15:46 +0000 (16:15 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 7 Apr 2014 16:15:46 +0000 (16:15 +0000)

Trivial merge