From: Adam Dickmeiss Date: Wed, 18 Apr 2012 11:57:31 +0000 (+0200) Subject: Merge branch 'master' into graceful_stop X-Git-Tag: v1.3.34~14 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=5b13052f4b5e568e3511d87c2e20c5332fc7db91;p=metaproxy-moved-to-github.git Merge branch 'master' into graceful_stop --- 5b13052f4b5e568e3511d87c2e20c5332fc7db91