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

Trivial merge