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)

Trivial merge