Merge branch 'integration' into dev
authorkhizmax <libcds.dev@gmail.com>
Sun, 12 Apr 2015 19:53:16 +0000 (22:53 +0300)
committerkhizmax <libcds.dev@gmail.com>
Sun, 12 Apr 2015 19:53:16 +0000 (22:53 +0300)

Trivial merge