From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 17 Jun 2011 08:24:19 +0000 (+0200)
Subject: Merge branch 'zoom_filter'
X-Git-Tag: v1.2.7~15
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=d1675bd836bb42547cad3ecc71bb5d45632fbce9;p=metaproxy-moved-to-github.git

Merge branch 'zoom_filter'
---

d1675bd836bb42547cad3ecc71bb5d45632fbce9