Merge commit 'c3352315d3563a201433837b0932bba249344f67' into dev
authorkhizmax <khizmax@gmail.com>
Tue, 15 Nov 2016 07:19:09 +0000 (10:19 +0300)
committerkhizmax <khizmax@gmail.com>
Tue, 15 Nov 2016 07:19:09 +0000 (10:19 +0300)
commit5784cdf5f0194b414836bb54de6b85a1f86a6a1a
treed425f4e10be568698e42e285c22107cd46dbd17f
parente60f678e53c18e1db521e5d16754195dad9d8050
parentc3352315d3563a201433837b0932bba249344f67
Merge commit 'c3352315d3563a201433837b0932bba249344f67' into dev