Merge branch 'svost-200000'
authorCryptoManiac <balthazar@yandex.ru>
Wed, 2 Sep 2015 17:16:56 +0000 (20:16 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Wed, 2 Sep 2015 17:16:56 +0000 (20:16 +0300)

Trivial merge