From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Tue, 12 Feb 2013 23:28:00 +0000 (-0800)
Subject: Merge branch 'master' of ssh://git.freedesktop.org/git/systemd/systemd into work
X-Git-Tag: v198~287
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8d6167101696a28b7ac61b48fd2c1920564c4e90

Merge branch 'master' of ssh://git.freedesktop.org/git/systemd/systemd into work
---

8d6167101696a28b7ac61b48fd2c1920564c4e90