From: Adam Dickmeiss <adam@indexdata.dk>
Date: Sat, 28 Nov 2009 13:03:41 +0000 (+0100)
Subject: Merge branch 'master' into yaz4
X-Git-Tag: v4.0.0~106
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=5e547a006fbbdbc217b244818dcf92bc7310faef;p=yaz-moved-to-github.git

Merge branch 'master' into yaz4

Conflicts:
	configure.ac
	debian/changelog
---

5e547a006fbbdbc217b244818dcf92bc7310faef