Merge commit '84b5cb1'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Nov 2012 20:19:39 +0000 (20:19 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Nov 2012 20:19:39 +0000 (20:19 +0000)
commit034ee6942c1d511af643cabeb227a68ee018aa32
tree96f9da9b901c82ca974d7deff16d039fe8bb7a7f
parent10d3684524dcf32bebd220ae71e91b7e49546880
parent84b5cb1253b87b493fd96663af26010159a5e923
Merge commit '84b5cb1'

Conflicts:
eloipool.py
eloipool.py
util.py