From: Heikki Levanto <heikki@indexdata.dk>
Date: Thu, 13 Jun 2013 10:16:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into rewrite-filter
X-Git-Tag: v1.3.59~57^2~7
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=c9d6971088c3b1a3a3faa658e54390c809852e16;hp=c9d6971088c3b1a3a3faa658e54390c809852e16;p=metaproxy-moved-to-github.git

Merge remote-tracking branch 'origin/master' into rewrite-filter
---