Merge branch 'master' into resource-encapsulation
[platform/upstream/iotivity.git] / resource / csdk / routing / src / routingmanager.c
2015-09-18 hunje.yeonMerge branch 'master' into resource-encapsulation
2015-09-17 Jaehong JoMerge remote-tracking branch 'origin/routing-manager'