From: Maxim Mamontov Date: Thu, 14 Nov 2013 20:01:45 +0000 (+0200) Subject: Merge branch 'log-unauth-reasons' X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/64b687f8ec36a103865044613cb0f42f98aeda3a?hp=64b687f8ec36a103865044613cb0f42f98aeda3a Merge branch 'log-unauth-reasons' Conflicts: projects/stargazer/user_impl.cpp ---