Merge commit 'f25c32a'
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 2 Feb 2013 01:45:04 +0000 (01:45 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 2 Feb 2013 01:45:04 +0000 (01:45 +0000)
commite9d4af0f3786a120e0900f7c37ab659f9d0ccc12
tree6fcbb0001d2829378e7d99323e705a2a558efe8a
parent178730e32cfb63d0863eb0433682a83a71918101
parentf25c32af8edee3058cba3eccdedcd41c2b570e09
Merge commit 'f25c32a'

Conflicts:
eloipool.py
eloipool.py