Merge branch 'tizen' into cynara 31/60631/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 29 Feb 2016 11:16:50 +0000 (12:16 +0100)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 29 Feb 2016 11:16:50 +0000 (12:16 +0100)
commit2bb6e45b7ee73708a2500dc5d8353850531df5a1
tree6db607920d833ac03dd98b01a7aa7ceb03b4751e
parent7f8102ed77ff834045b00a4fc74e41ea7764a4e1
parentf3d77c9bb641546f6d748dd95f6791d1d4f80c99
Merge branch 'tizen' into cynara

Conflicts:
src/security-server-tests/security_server_tests_password.cpp

Change-Id: I753ad499c1bf64330fc0af352e7468c13539c752