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

Trivial merge