# HG changeset patch
# User Teemu Piippo <teemu@compsta2.com>
# Date 1469266445 -10800
# Node ID febc3ed5435c1d2791e5d48c1b05f0911c398c69
# Parent  0150f86e68f02653a9aa1625d255c888d5ca79b8# Parent  96ffd13c08a261717e860126d33ac5eb4826b71d
Merged with default

diff -r 0150f86e68f0 -r febc3ed5435c sources/network/rconsession.cpp
diff -r 0150f86e68f0 -r febc3ed5435c sources/network/rconsession.h