From: Adam Dickmeiss Date: Tue, 17 Apr 2012 10:49:12 +0000 (+0200) Subject: Merge branch 'master' into graceful_stop X-Git-Tag: v1.3.34~17 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=3597c200e3876e2c7a44e6eca0d60fab397de900;p=metaproxy-moved-to-github.git Merge branch 'master' into graceful_stop --- 3597c200e3876e2c7a44e6eca0d60fab397de900