Merge commit '29aae72'
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 29 Oct 2013 16:54:40 +0000 (16:54 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 29 Oct 2013 16:54:40 +0000 (16:54 +0000)
commit8ceb124e5e7f67e58427365d20f90def7da0083e
treee6e980da1c5df4905faa45016f7033de11c6e0bb
parent9d7eac746c262a874cbdc59ec6500ac769d90c4d
parent29aae7288463c7cf9dcb75d7e612408381b75970
Merge commit '29aae72'

Conflicts:
eloipool.py
eloipool.py