From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 12 Oct 2011 02:29:11 +0000 (+0200)
Subject: Merge branch 'master' into journal
X-Git-Tag: v38~144^2~61
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=689b9a22f7fa89686b2b5240b7ee9f449dea5630;hp=689b9a22f7fa89686b2b5240b7ee9f449dea5630;ds=sidebyside

Merge branch 'master' into journal
---