Merge branch 'checkShare_vars' into serve_getmemorypool
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 23 Feb 2012 18:29:55 +0000 (13:29 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 23 Feb 2012 18:29:55 +0000 (13:29 -0500)
commitb2f40a65fda9e0238a7197b92695a6584e9a71e3
tree8881dd9d53fe117ad17bece0b8230a949e3029be
parenta0ad1ceeee871f2ae421563e67ad8f085c895a2b
parent054ca88d18820b8f3a08bf3ec6da0581be127088
Merge branch 'checkShare_vars' into serve_getmemorypool

Conflicts:
eloipool.py
eloipool.py