Merge commit '0768201'
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 1 Feb 2013 16:05:20 +0000 (16:05 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 1 Feb 2013 16:05:20 +0000 (16:05 +0000)
commit1553284237f2fbed6472e617aa30fc7c249e9944
tree714fb299d8efa6f8b50877a1883089e918becd32
parent4524c233c3f4d57416ef50968ef8e95ec0fc1e8b
parent076820121f6b60094a08e21467f271f29633a111
Merge commit '0768201'

Conflicts:
eloipool.py
eloipool.py