Merge branch 'master' into dev
authorkhizmax <libcds.dev@gmail.com>
Wed, 1 Jun 2016 20:15:06 +0000 (23:15 +0300)
committerkhizmax <libcds.dev@gmail.com>
Wed, 1 Jun 2016 20:15:06 +0000 (23:15 +0300)

Trivial merge