Merge branch 'dev'
authorkhizmax <khizmax@gmail.com>
Tue, 12 May 2015 06:27:56 +0000 (09:27 +0300)
committerkhizmax <khizmax@gmail.com>
Tue, 12 May 2015 06:27:56 +0000 (09:27 +0300)
commiteb6d1fb7fdf536eee0d87768a08ca3b8876b06b0
tree83d557424b43c905c34dd2f7707dde3e902ab5a9
parent7cd05f9398f3a55a358427a0f4480958b2a0fead
parent6fa355b13c372e0a53d27669b10a0c9eb9b9a6b9
Merge branch 'dev'