Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 15 Mar 2011 13:19:48 +0000 (14:19 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 15 Mar 2011 13:19:48 +0000 (14:19 +0100)
commitb0438903da4a34ce1dab8dbdc35eb3d938cbba90
treebfaeadc092979a1bb2b46f37073026d8cf3a868d
parentc43e561fdfe12989a6040163dae0e28ba0a02453
parent9b1c57318aabdbf8e6d0dc33e3a9848bdf062c64
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

Conflicts:
win/yaz.nsi