Merge branch 'master' into yaz-728
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 24 Jan 2014 11:54:47 +0000 (12:54 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 24 Jan 2014 11:54:47 +0000 (12:54 +0100)
1  2 
win/makefile

diff --cc win/makefile
Simple merge