Merge branch 'dev-gtest' into dev
authorkhizmax <libcds.dev@gmail.com>
Thu, 7 Jan 2016 10:28:59 +0000 (13:28 +0300)
committerkhizmax <libcds.dev@gmail.com>
Thu, 7 Jan 2016 10:28:59 +0000 (13:28 +0300)

Trivial merge