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

Trivial merge