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

Trivial merge