Merge branch 'cynara' into tizen 92/30692/1
authorRafal Krypa <r.krypa@samsung.com>
Mon, 24 Nov 2014 10:19:41 +0000 (11:19 +0100)
committerRafal Krypa <r.krypa@samsung.com>
Mon, 24 Nov 2014 10:19:41 +0000 (11:19 +0100)
commitbf407a931960de718014d10e1d5329e0917a8ff5
tree54f08daa9aaa9cb6c7c179991a52a4415aff6aea
parent8b2deacaaec84d4a59405fed722067a3e3d8703f
parent4bee76d3a71ffcbc8badd3b3882e54b1a9589561
Merge branch 'cynara' into tizen

Conflicts:
tests/cynara-tests/common/cynara_test_admin.h
tests/cynara-tests/test_cases.cpp

Change-Id: I49296db7a8983f3aee1f4750852ea516e9d7f3a2
packaging/security-tests.spec
tests/framework/include/dpl/test/test_runner.h