Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 23 Oct 2014 12:36:00 +0000 (12:36 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 23 Oct 2014 12:36:00 +0000 (12:36 +0000)

Trivial merge