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

Trivial merge