Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 23 Sep 2014 09:34:34 +0000 (11:34 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 23 Sep 2014 09:34:34 +0000 (11:34 +0200)

Trivial merge