Merge branch 'dev'
authorkhizmax <khizmax@gmail.com>
Fri, 27 Mar 2015 14:14:50 +0000 (17:14 +0300)
committerkhizmax <khizmax@gmail.com>
Fri, 27 Mar 2015 14:14:50 +0000 (17:14 +0300)
commit0e1fc1095b216d5e9f93032ca554a2ed1fb4189c
treef104e803ee686843dc37ac87c56fbd2228cc2850
parent48fc7c34f70be8102997baa2af2638a05211c48d
parenta9b13bc2dff512c92d51829cd48cd4ee2a093c85
Merge branch 'dev'