Merge remote-tracking branch 'khizmax/master'
authorUnknown <mfgalimullin@yandex.ru>
Wed, 23 Aug 2017 11:08:15 +0000 (14:08 +0300)
committerUnknown <mfgalimullin@yandex.ru>
Wed, 23 Aug 2017 11:08:15 +0000 (14:08 +0300)
commitbab4807d0f9a78324bf7468576a18dff357bf905
tree43a337a63a59ba3d8cd3180316b22c5d7270f57d
parent8545ba9c8ad48800cb0977882257b016bde97851
parent0fad9acd85790f2c1f8563a1f7f04d8a67176996
Merge remote-tracking branch 'khizmax/master'