Merge branch 'master' into IOMultiplexer
authorpk910 <philipp@zoelle1.de>
Wed, 22 Aug 2012 00:25:23 +0000 (02:25 +0200)
committerpk910 <philipp@zoelle1.de>
Wed, 22 Aug 2012 00:25:23 +0000 (02:25 +0200)
commit291f15058a67b95bdfe6f6861cdfcb8ffd626149
tree5f07c962979445a91f828c7d4c0be2a8523396ce
parent9eb6179eb4d2c394c7913eda496c922cb8c5d1a8
parentcee5525a5937307077e367dfa0f9df85f7f0b817
Merge branch 'master' into IOMultiplexer

Conflicts:
src/signal.c
src/signal.c