From: Dennis Schafroth Date: Thu, 3 Nov 2011 14:49:38 +0000 (+0100) Subject: Merge branch 'bytarget_block' of ssh://git.indexdata.com/home/git/pub/pazpar2 into... X-Git-Tag: mobile-beta-1~24 X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=a2dcc1ac328b846b0dc727ba71e6a58ecaa4b3e1;hp=fc794a5a4623194e7e5cff1ea63ecdc80575312e;p=pazpar2-moved-to-github.git Merge branch 'bytarget_block' of ssh://git.indexdata.com/home/git/pub/pazpar2 into bytarget_block Conflicts: src/http_command.c add active client check ---