Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
authorpk910 <philipp@zoelle1.de>
Tue, 15 Jul 2014 19:55:02 +0000 (21:55 +0200)
committerpk910 <philipp@zoelle1.de>
Tue, 15 Jul 2014 19:55:02 +0000 (21:55 +0200)

Trivial merge