From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 20 Apr 2012 13:31:29 +0000 (+0200)
Subject: Merge branch 'master' into graceful_stop
X-Git-Tag: v1.3.34~13
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=027ebb5197840e639e963f3ca477746f8598d698;p=metaproxy-moved-to-github.git

Merge branch 'master' into graceful_stop
---

027ebb5197840e639e963f3ca477746f8598d698