Merge branch 'bugfix_thr_sigusr1'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 7 May 2012 16:35:54 +0000 (16:35 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 7 May 2012 16:35:54 +0000 (16:35 +0000)
commit0630e813bab58203ae86693005d19488e3cf3121
treecf7631fe38471cbd7823ff355fc08b867628a920
parentc529153bd3026bcb58dde458e792c052f883ade7
parentf9472b127b9d37a42e916976055f49e8f75c1cbb
Merge branch 'bugfix_thr_sigusr1'

Conflicts:
eloipool.py
eloipool.py