Merge branch 'server_no_deadlock'
commit1aa8420bc7e7bf7531e9aafc3d8303203477111a
authorsletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Fri, 5 Feb 2010 17:18:58 +0000 (5 17:18 +0000)
committersletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Fri, 5 Feb 2010 17:18:58 +0000 (5 17:18 +0000)
tree155fa5b203eeb818673980677db6eb252b55e39c
parent107ffadab90ec0a8d5447d20c0fdd7bbe21be597
parent7e46cbea3b673d8ab293fe6176a445a74c9ef423
Merge branch 'server_no_deadlock'

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3901 0c269be4-1314-0410-8aa9-9f06e86f4224