Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 4 Nov 2014 18:00:43 +0000 (18:00 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 4 Nov 2014 18:00:43 +0000 (18:00 +0000)

Trivial merge