Merge branch 'dev'
authorkhizmax <libcds.dev@gmail.com>
Wed, 1 Jun 2016 05:21:57 +0000 (08:21 +0300)
committerkhizmax <libcds.dev@gmail.com>
Wed, 1 Jun 2016 05:21:57 +0000 (08:21 +0300)

Trivial merge