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