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

Trivial merge