From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 28 Feb 2012 13:43:48 +0000 (+0100)
Subject: Merge branch 'master' into hide_errors
X-Git-Tag: v1.3.25~6^2~3
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=e8565bbfdfe774c8df8ca33b43fd7ecd3d1208d0;hp=-c;p=metaproxy-moved-to-github.git

Merge branch 'master' into hide_errors
---

e8565bbfdfe774c8df8ca33b43fd7ecd3d1208d0