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