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

Trivial merge