Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 23 Apr 2014 12:17:46 +0000 (12:17 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 23 Apr 2014 12:17:46 +0000 (12:17 +0000)

Trivial merge