Merge commit '8caa4e1'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Nov 2012 20:31:56 +0000 (20:31 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Nov 2012 20:31:56 +0000 (20:31 +0000)
commite7a5dfb5329cf3e4978c7222fc5a3c75df0a8d29
treec63abf00feeee75ba07a6a3971f7eb4baf02121e
parent7ce25fb68e8b5b7cc72615cfd7b740244c12bca3
parent8caa4e16e789c9772ddc59fa9a5d7a49db34560e
Merge commit '8caa4e1'

Conflicts:
eloipool.py
config.py.example
eloipool.py
util.py