Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 24 Sep 2013 11:26:22 +0000 (11:26 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 24 Sep 2013 11:26:22 +0000 (11:26 +0000)

Trivial merge