Merge branch 'dev'
authorkhizmax <khizmax@gmail.com>
Fri, 5 Dec 2014 15:24:00 +0000 (18:24 +0300)
committerkhizmax <khizmax@gmail.com>
Fri, 5 Dec 2014 15:24:00 +0000 (18:24 +0300)

Trivial merge