Merge branch 'master' into 'security-CKM' branch.
[platform/upstream/iotivity.git] / resource / oc_logger / cpp / oc_ostream_logger.cpp
2014-11-06 William R. DieterRepo Merge: Moving resource API down a directory