Merge branch 'v5-stable' into v5-devel
authorRainer Gerhards <rgerhards@adiscon.com>
Fri, 2 Mar 2012 11:05:59 +0000 (12:05 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Fri, 2 Mar 2012 11:05:59 +0000 (12:05 +0100)
commit14d415e4a84e2c08df1b23a86959f0d9b0006687
treea972c997592716dc30b33f323ab80a08575ada29
parent249828deebd877693298a504ca1637e6b30c5564
parent536c9370f0773d25ee7a85aa44a10d07bc5e1420
Merge branch 'v5-stable' into v5-devel
plugins/imuxsock/imuxsock.c