Merge branch '1.3-rel' (6bf7601f) 67/21167/2
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Sat, 1 Jul 2017 11:33:45 +0000 (13:33 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Sat, 1 Jul 2017 11:33:45 +0000 (13:33 +0200)
commitea166571e58e7169c8ce0d998dfeaca968508549
treeade71376bcc5b48d19535ec70e3078746132fdb0
parent529c47aaddab5a9327e397b4bb5443a4549763f5
parent6bf7601fc48fb113c4dd4dfa9d5d7c4d26ed9dab
Merge branch '1.3-rel' (6bf7601f)

Conflicts:
  plugins/zigbee_wrapper/src/zigbee_wrapper.c

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: Ic02a458484a590e318be77053e67c77a20696bd6
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>