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)
commit2d694e116e0f9c5bf9f72c78d12892266cfa8288
treea1444ac24ee2804307bf0485c87c6595fe3a83bb
parent981be1f880efeca4ecac1156317f6dbebf707087
parent0f7daad2c06bc06a9d66fc5d6b6e65585b767866
Merge remote-tracking branch 'remotes/IOMultiplexer/v2'

Conflicts:
configure.ac
configure.ac