Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 10 Sep 2014 10:21:51 +0000 (10:21 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 10 Sep 2014 10:21:51 +0000 (10:21 +0000)

Trivial merge