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

Trivial merge