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

Trivial merge