Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Nov 2009 11:45:13 +0000 (12:45 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Nov 2009 11:45:13 +0000 (12:45 +0100)
1  2 
win/makefile

diff --cc win/makefile
Simple merge