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)

Trivial merge