Merge remote-tracking branch 'remotes/origin_project/master'
authorCryptoManiac <balthazar@yandex.ru>
Fri, 15 Aug 2014 22:49:01 +0000 (02:49 +0400)
committerCryptoManiac <balthazar@yandex.ru>
Fri, 15 Aug 2014 22:49:01 +0000 (02:49 +0400)

Trivial merge