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)
commit4b8b526fd4449f43debda51524325c251646a9c1
tree1dcbae2b4ba541c6f0b6da5d42eb8b1723ec7946
parent7efed25c2ed807d32001e749f87f2eb300548c22
parente050e2bc6f5e50c42f7b04cd002d47cd5e5ad6cf
Merge branch 'master' into yaz-728
win/makefile