Merge branch 'stable'
commit63053f8c6608501832dbc9d9ab34d45a12204a11
authorBoris Bobrov <breton@cynicmansion.ru>
Sun, 20 Dec 2015 23:46:24 +0000 (21 02:46 +0300)
committerBoris Bobrov <breton@cynicmansion.ru>
Sun, 20 Dec 2015 23:46:24 +0000 (21 02:46 +0300)
treeb560707b909ad626ab1a7fddde5005f82d5396b5
parentf58fac095048c28b38096410e7b8f59cf75e26b8
parent355d062dd4e35409af92e136666baf211161b7cb
Merge branch 'stable'