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