Merge commit 'd5eaf7b' into stratum_sidmanager
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 7 Jul 2013 16:44:27 +0000 (16:44 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 7 Jul 2013 16:44:27 +0000 (16:44 +0000)
commit8f8f01a5b75988e65e2a15b096631dbce8be5a4c
treeba2a28a07f735c31654c27643a6453f64a481ce3
parent9ca9fa595fe796da8e1809a7fa3376744fd621f6
parentd5eaf7bab4e11fb21c7962490a55e85539ecd8e2
Merge commit 'd5eaf7b' into stratum_sidmanager

Conflicts:
stratumserver.py
stratumserver.py
util.py