Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 31 Oct 2014 08:46:32 +0000 (08:46 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 31 Oct 2014 08:46:32 +0000 (08:46 +0000)

Trivial merge