review.tizen.org Git - platform/upstream/ima-evm-utils.git/commit

author	Zbigniew Jasinski <z.jasinski@samsung.com>
	Tue, 13 May 2014 10:00:37 +0000 (12:00 +0200)
committer	Zbigniew Jasinski <z.jasinski@samsung.com>
	Tue, 13 May 2014 10:00:37 +0000 (12:00 +0200)
commit	944cf4990dcb61804d0c9a311985e532b5af2610
tree	c6beebb13f66b3fd65a090950b43b71ea63bbbb5	tree \| snapshot
parent	1f16f6e6756f6685863aa8f1b0621f2b172fde1d	commit \| diff
parent	7ece92b4e1ff58a8a805548ef60b4edd4b6296be	commit \| diff

Merge branch 'upstream' into tizen

Conflicts:
packaging/ima-evm-utils.spec

Change-Id: I33c22533d7a4d1ff00cd75ef2df4bae0ded1c3a4