Merge remote-tracking branch 'chiiph/feature/signal_events' into develop
authorKali Kaneko <kali@futeisha.org>
Fri, 16 Aug 2013 18:43:29 +0000 (20:43 +0200)
committerKali Kaneko <kali@futeisha.org>
Fri, 16 Aug 2013 18:43:29 +0000 (20:43 +0200)

Trivial merge