Merge branch 'bugfix_rejreasondelayed'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Nov 2012 23:33:27 +0000 (23:33 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Nov 2012 23:33:27 +0000 (23:33 +0000)
commit611643b06d57648f555d6e9d7809e5848a5f48f3
treee125d4eb0ec81dc6fa621ae8891bcfaffdf34bdc
parent947ea1ad5b73ea392783ef77d0a5514852a0343d
parent822c2295330a95325e10066d5ca48514898d3932
Merge branch 'bugfix_rejreasondelayed'

Conflicts:
eloipool.py
eloipool.py