Merge branch 'upstream' into tizen 92/68992/2 accepted/tizen/common/20160511.142311 accepted/tizen/common/20160615.193838 accepted/tizen/common/20160703.130057 accepted/tizen/ivi/20160630.003148 accepted/tizen/mobile/20160616.003449 accepted/tizen/mobile/20160630.003051 accepted/tizen/tv/20160630.003132 accepted/tizen/wearable/20160616.003444 accepted/tizen/wearable/20160630.003102 submit/accepted/tizen_common/20160629.063515 submit/tizen/20160511.074559 submit/tizen/20160615.114239 submit/tizen/20160629.063625 submit/tizen/20160725.050606
authorKichan Kwon <k_c.kwon@samsung.com>
Wed, 11 May 2016 03:00:07 +0000 (12:00 +0900)
committerKichan Kwon <k_c.kwon@samsung.com>
Wed, 11 May 2016 04:35:00 +0000 (13:35 +0900)
commit064b2722c00e5d32b35d3f47b24e7be3ad1c132b
treec7412d70ba06b47eed9e5454858258d45667e6a7
parent475038768f5f2e8ef3e305aa71ad48794474ca32
parentad21d48762fa70838d4ab4fbe8fe2a2e8a4dcef1
Merge branch 'upstream' into tizen

Change-Id: I96df0e91f76fd714f6ec007c707ae7360142c93f
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>
packaging/cryptsetup.spec