Merge branch 'stratum_sidmanager'
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 7 Jul 2013 16:52:55 +0000 (16:52 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 7 Jul 2013 16:52:55 +0000 (16:52 +0000)
commitde8129586a065488edcd2cf0ba2b9b5052d9c489
treef205bc6af0deb709849e02c5d8d5117b5cd4dda8
parent321426e96b762170273a7331cb7d64b6f52f5575
parent6838b41bc73adbcdf51d662d1318be4b61cfecf2
Merge branch 'stratum_sidmanager'

Conflicts:
stratumserver.py
stratumserver.py