Merge branch 'master' into new_protocol 43/35743/1
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 24 Feb 2015 07:50:14 +0000 (10:50 +0300)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 24 Feb 2015 07:52:28 +0000 (10:52 +0300)
Change-Id: I8c4d219be9e9b389e9c3af219917178d64fc9974
Signed-off-by: Dmitry Kovalenko <d.kovalenko@samsung.com>
1  2 
packaging/swap-modules.spec
us_manager/pf/pf_group.c

Simple merge
Simple merge