Merge branch 'master' into yaz4
authorAdam Dickmeiss <adam@indexdata.dk>
Sat, 28 Nov 2009 13:03:41 +0000 (14:03 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Sat, 28 Nov 2009 13:03:41 +0000 (14:03 +0100)
commit5e547a006fbbdbc217b244818dcf92bc7310faef
treea23c2c18c941179a76add140aabac00f51d652f5
parent10c562bc3ccaaa440189f279ca562327612f87c6
parentfc66745b60adb55d6b9f998c0bb9d8f607953e51
Merge branch 'master' into yaz4

Conflicts:
configure.ac
debian/changelog