Merge pull request #2079 from alarcher/x11_S12_98_5
commit0f8746ca3490b65eef987ce02d95e25804c24c4c
authorAlexander Pyhalov <apyhalov@gmail.com>
Thu, 2 Jun 2016 17:13:44 +0000 (2 21:13 +0400)
committerAlexander Pyhalov <apyhalov@gmail.com>
Thu, 2 Jun 2016 17:13:44 +0000 (2 21:13 +0400)
treea864c797a544951a31e1bb78ef282b1cf1d27815
parentff085b3de9bdf6489a7c70b7c8452f021dcb7d23
parentd66cff9629ecf79bf2dc7562c37a16380273a59b
Merge pull request #2079 from alarcher/x11_S12_98_5