Merge branch 'integration' into dev
authorkhizmax <libcds.dev@gmail.com>
Mon, 23 Mar 2015 18:01:59 +0000 (21:01 +0300)
committerkhizmax <libcds.dev@gmail.com>
Mon, 23 Mar 2015 18:01:59 +0000 (21:01 +0300)

Trivial merge