From: Jacek Migacz Date: Tue, 4 Dec 2012 08:59:17 +0000 (+0100) Subject: Merge branch 'systemd' X-Git-Tag: submit/tizen/20141222.083159~238^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1938459c52017a43b239866ac645db0ab70b717b;p=platform%2Fcore%2Fsystem%2Fdeviced.git Merge branch 'systemd' Conflicts: packaging/system-server.spec Change-Id: I396eccf32a949ef0baca7c4bf460a338492ba281 --- 1938459c52017a43b239866ac645db0ab70b717b