Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 2 Aug 2011 08:11:10 +0000 (10:11 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 2 Aug 2011 08:11:10 +0000 (10:11 +0200)
1  2 
src/filter_zoom.cpp

Simple merge