From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 25 Jul 2011 14:44:02 +0000 (+0200)
Subject: Merge branch 'master' into content_proxy
X-Git-Tag: v1.3.0~6
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=fa49389565de4827e5faacc91a14068358675fda;p=metaproxy-moved-to-github.git

Merge branch 'master' into content_proxy
---

fa49389565de4827e5faacc91a14068358675fda