Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 2 Jul 2014 08:49:06 +0000 (08:49 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 2 Jul 2014 08:49:06 +0000 (08:49 +0000)

Trivial merge