Merge branch 'dev' into integration
authorkhizmax <libcds.dev@gmail.com>
Mon, 27 Jun 2016 18:37:37 +0000 (21:37 +0300)
committerkhizmax <libcds.dev@gmail.com>
Mon, 27 Jun 2016 18:37:37 +0000 (21:37 +0300)

Trivial merge