From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 18 Aug 2014 16:12:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v216~61
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=630a4d9ea7298fb4a494662cbb4871069143ff56

Merge remote-tracking branch 'origin/master'
---

630a4d9ea7298fb4a494662cbb4871069143ff56