Merge remote-tracking branch 'origin/unstable' into tizen 80/30580/1
authorPiotr Bartosiewicz <p.bartosiewi@partner.samsung.com>
Thu, 20 Nov 2014 14:23:08 +0000 (15:23 +0100)
committerPiotr Bartosiewicz <p.bartosiewi@partner.samsung.com>
Thu, 20 Nov 2014 14:23:08 +0000 (15:23 +0100)
commit500265fc4034012002a5cc6d4317f1a9b026e41e
tree556e7a44673f0b3098bfb5a7de67b362790c99ea
parent47782bbb0c4b7bf91aa773718d0c9f681fba6eaf
parente3d2a40e88a88c3319bf3d06378549b4e1ce1e5e
Merge remote-tracking branch 'origin/unstable' into tizen

Conflicts:
packaging/security-containers.spec
server/CMakeLists.txt
tests/unit_tests/CMakeLists.txt
tests/unit_tests/client/ut-client.cpp

Change-Id: I9bc4f97213d9112766345411ceac2436a7d15d05
packaging/security-containers.spec
server/CMakeLists.txt
server/container.cpp
server/container.hpp
server/containers-manager.cpp
server/containers-manager.hpp
server/server.cpp
tests/unit_tests/CMakeLists.txt
tests/unit_tests/client/ut-client.cpp