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

Trivial merge