Merge branch 'master' into yaz-728
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 22 Jan 2014 13:32:06 +0000 (14:32 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 22 Jan 2014 13:32:06 +0000 (14:32 +0100)
commita741500ee64cc5009f82d94585ea389e1c5e6613
tree5f7fbc762c7a25b030e56b3477aba6ab770987c5
parent32790840d73b1f4a4bde1478e6b14699aac00e94
parent3e824a6f36428c6a4ab72246796047803c080828
Merge branch 'master' into yaz-728
src/zoom-c.c