Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 v1.5.7
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 19 Aug 2011 11:46:15 +0000 (13:46 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 19 Aug 2011 11:46:15 +0000 (13:46 +0200)
1  2 
win/makefile

diff --cc win/makefile
Simple merge