From: Ivan Maidanski <ivmai@mail.ru>
Date: Wed, 10 Sep 2014 23:14:49 +0000 (+0400)
Subject: Merge branch 'fix_tsx_bug' into release-7_4
X-Git-Tag: gc7_4_4~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ad293ec1d259125e63020d4c3b6f9e6b67d9870;p=gc

Merge branch 'fix_tsx_bug' into release-7_4
---

9ad293ec1d259125e63020d4c3b6f9e6b67d9870