From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 15 Mar 2011 13:19:48 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v4.2.0~54^2~6
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=b0438903da4a34ce1dab8dbdc35eb3d938cbba90

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

Conflicts:
	win/yaz.nsi
---

b0438903da4a34ce1dab8dbdc35eb3d938cbba90