Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
authorpk910 <philipp@zoelle1.de>
Wed, 28 Jan 2015 01:20:45 +0000 (02:20 +0100)
committerpk910 <philipp@zoelle1.de>
Wed, 28 Jan 2015 01:20:45 +0000 (02:20 +0100)
Conflicts:
configure.ac

1  2 
configure.ac

diff --cc configure.ac
Simple merge