Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 22 Sep 2014 13:39:47 +0000 (13:39 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 22 Sep 2014 13:39:47 +0000 (13:39 +0000)

Trivial merge