Merge branch 'integration' into dev
authorkhizmax <khizmax@gmail.com>
Fri, 3 Apr 2015 13:04:34 +0000 (16:04 +0300)
committerkhizmax <khizmax@gmail.com>
Fri, 3 Apr 2015 13:04:34 +0000 (16:04 +0300)

Trivial merge