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)
1  2 
src/zoom-c.c

diff --cc src/zoom-c.c
Simple merge