Merge remote-tracking branch 'remotes/origin_project/master'
authorCryptoManiac <balthazar@yandex.ru>
Sun, 13 Jul 2014 23:32:58 +0000 (03:32 +0400)
committerCryptoManiac <balthazar@yandex.ru>
Sun, 13 Jul 2014 23:32:58 +0000 (03:32 +0400)

Trivial merge