Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/yaz
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 30 Mar 2011 14:03:04 +0000 (16:03 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 30 Mar 2011 14:03:04 +0000 (16:03 +0200)
1  2 
win/makefile

diff --cc win/makefile
Simple merge