Merge branch 'sigint' closes #5178
authorTom Clegg <tom@curoverse.com>
Tue, 10 Mar 2015 20:16:15 +0000 (16:16 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 10 Mar 2015 20:16:15 +0000 (16:16 -0400)

Trivial merge