Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 21 Jul 2014 11:31:38 +0000 (11:31 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 21 Jul 2014 11:31:38 +0000 (11:31 +0000)

Trivial merge