Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 24 Apr 2014 14:42:11 +0000 (14:42 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 24 Apr 2014 14:42:11 +0000 (14:42 +0000)

Trivial merge