Merge branch 'integration' into dev
authorkhizmax <khizmax@gmail.com>
Mon, 30 Mar 2015 11:38:59 +0000 (14:38 +0300)
committerkhizmax <khizmax@gmail.com>
Mon, 30 Mar 2015 11:38:59 +0000 (14:38 +0300)

Trivial merge