From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Nov 2011 18:44:16 +0000 (+0100)
Subject: Merge branch 'master' into journal
X-Git-Tag: v38~144^2~41
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1e2579fdeb7608719cb28da0b5061f48ba0efc34;hp=1e2579fdeb7608719cb28da0b5061f48ba0efc34

Merge branch 'master' into journal
---