Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
authorpk910 <philipp@zoelle1.de>
Tue, 15 Jul 2014 20:17:31 +0000 (22:17 +0200)
committerpk910 <philipp@zoelle1.de>
Tue, 15 Jul 2014 20:17:31 +0000 (22:17 +0200)

Trivial merge