Merge branch 'bugfix_short_cb'
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 21 Jun 2012 17:49:07 +0000 (17:49 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 21 Jun 2012 17:49:07 +0000 (17:49 +0000)
commita6fd03a2b5219b2bc635d5a92e20f47a4cdd8215
tree98fc0283ec05b72da3e6ab31d1f5184e32de72ba
parent37ae7ad6dd9a92b97f90f7e2fdb9e9c865fc9f22
parent21722d3a82b1f0c0ce47d62ec9a05a1f1439bc6b
Merge branch 'bugfix_short_cb'
eloipool.py