Merge branch 'server' of https://github.sec.samsung.net/RS7-SECIOTSRK/iotswsec into...
authorm.dalakov <m.dalakov@samsung.com>
Mon, 4 Sep 2017 13:46:35 +0000 (16:46 +0300)
committerm.dalakov <m.dalakov@samsung.com>
Mon, 4 Sep 2017 13:46:35 +0000 (16:46 +0300)

Trivial merge