Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 7 Nov 2014 22:15:21 +0000 (22:15 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 7 Nov 2014 22:15:21 +0000 (22:15 +0000)

Trivial merge