Merge branch 'v5-stable' into v5-devel
authorRainer Gerhards <rgerhards@adiscon.com>
Thu, 1 Mar 2012 13:47:33 +0000 (14:47 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Thu, 1 Mar 2012 13:47:33 +0000 (14:47 +0100)
commit249828deebd877693298a504ca1637e6b30c5564
tree27d8e99f0838851de552ee2ed158c8eca863cdaa
parent115718de967f673fc89ce8b8be1b16081ca4dde1
parente31e840d5d6bf823b7129132c5582f86d3693f6c
Merge branch 'v5-stable' into v5-devel
plugins/imuxsock/imuxsock.c