Merge branch 'integration' into dev
authorkhizmax <libcds.dev@gmail.com>
Sun, 19 Apr 2015 17:35:42 +0000 (20:35 +0300)
committerkhizmax <libcds.dev@gmail.com>
Sun, 19 Apr 2015 17:35:42 +0000 (20:35 +0300)

Trivial merge