Merge branch 'master' into systemd
authorKarol Lewandowski <k.lewandowsk@samsung.com>
Wed, 14 Nov 2012 16:52:19 +0000 (17:52 +0100)
committerKarol Lewandowski <k.lewandowsk@samsung.com>
Wed, 14 Nov 2012 16:52:19 +0000 (17:52 +0100)
commit1341362e2b4c153bbf3ffd18dee80eb4f8dbc9b2
tree3f4dcda476666fb8be35812297957605c7e4a9d3
parent0ba16a06f2a72c615f41f94b6e4bb697f825941b
parentc3a7c9d1188f08fdc950858c589173bb5bb0c817
Merge branch 'master' into systemd

Conflicts:
packaging/libprivilege-control.spec

Change-Id: Iab7c2ae185a943d8abbcc7fff6983e1053e8e903
group
packaging/libprivilege-control.spec