Merge branch 'master' of github.com:majestrate/i2pd

Fixed Conflicts:
	SAM.cpp
This commit is contained in:
Jeff Becker 2016-05-29 09:36:01 -04:00
commit 0b3a719a95
No known key found for this signature in database
GPG key ID: AB950234D6EA286B

View file

@ -49,7 +49,6 @@ namespace client
{ {
if (m_Session) if (m_Session)
m_Session->DelSocket (shared_from_this ()); m_Session->DelSocket (shared_from_this ());
}
break; break;
} }
case eSAMSocketTypeAcceptor: case eSAMSocketTypeAcceptor: