Merge branch 'multisource'
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 2 Feb 2013 05:03:03 +0000 (05:03 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 2 Feb 2013 05:03:03 +0000 (05:03 +0000)
commitad642b9ca0693f1e505e78751d8319170c2e4218
tree26df456dbfab03cfdb64ff2d271f00050482ce4a
parent4c04dcac15f5ab366e3b003cbd5a9b29e95a54e7
parent19c6199adbb67b391adef11cb6bb4dda3945a61c
Merge branch 'multisource'
eloipool.py