Merge commit '5cfd67a'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 18 Feb 2013 21:46:47 +0000 (21:46 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 18 Feb 2013 21:46:47 +0000 (21:46 +0000)
commitb93530a8f32141f16495d7e1a8bed5ab5c2576b4
tree8888ba6b68d7dc7b1e16311945475c4367bff8dd
parentd0243ba8c82a86c2a078bf18c8b5a04c7c0b77e8
parent5cfd67aa2a291462a3b64cf8ed7a2e956dae51bc
Merge commit '5cfd67a'

Conflicts:
eloipool.py
eloipool.py