Merge branch 'multisource'
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 2 Feb 2013 01:45:34 +0000 (01:45 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 2 Feb 2013 01:45:34 +0000 (01:45 +0000)
commit4c04dcac15f5ab366e3b003cbd5a9b29e95a54e7
treee32e4296f021363b4f0c7f4aac8611c4b15f5df8
parente9d4af0f3786a120e0900f7c37ab659f9d0ccc12
parentaa60b986aecfa554717dba66634d3601f83ca920
Merge branch 'multisource'
eloipool.py