Merge branch 'systemd'
authorJacek Migacz <j.migacz@samsung.com>
Tue, 4 Dec 2012 08:59:17 +0000 (09:59 +0100)
committerJacek Migacz <j.migacz@samsung.com>
Tue, 4 Dec 2012 09:00:39 +0000 (10:00 +0100)
commit1938459c52017a43b239866ac645db0ab70b717b
tree0643b8cf2bf0f61a1f9cfd0609ddfa2641495e92
parent31188cc7612df0596d48b8cd5a10904bfb196ad8
parentf1052750a02ee815241b1b1c850a23624dcd8dba
Merge branch 'systemd'

Conflicts:
packaging/system-server.spec

Change-Id: I396eccf32a949ef0baca7c4bf460a338492ba281
packaging/system-server.spec