Merge branch '2.2.x' of github.com:eiskaltdcpp/eiskaltdcpp into 2.2.x
authorEugene Petrov <dhamp@ya.ru>
Sat, 15 Dec 2012 06:42:08 +0000 (10:42 +0400)
committerEugene Petrov <dhamp@ya.ru>
Sat, 15 Dec 2012 06:42:08 +0000 (10:42 +0400)
commit8b975419cd9bec595d5c899ae1b94b27903b89c4
treef21d5be65de7527024efbd94943f42b8da302e14
parentd38fbdc192ecb3be782ad19f613b32b01f239a5b
parent9fd281f867709664e2e270bda73b79f7dd6dc9c2
Merge branch '2.2.x' of github.com:eiskaltdcpp/eiskaltdcpp into 2.2.x