Merge branch 'checkShare_vars'
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 23 Feb 2012 18:28:21 +0000 (13:28 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 23 Feb 2012 18:28:21 +0000 (13:28 -0500)
commit012b76bb69cbb7cbfa9f285f1bbb45c0dc004826
treee119c170dd29eb239fcdbd36135b04b31dfa0802
parent3c7cd67b97bdaf7e63d69804d31a934c698ed6d1
parent054ca88d18820b8f3a08bf3ec6da0581be127088
Merge branch 'checkShare_vars'

Conflicts:
eloipool.py
eloipool.py