From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 12 Dec 2008 18:48:14 +0000 (+0100)
Subject: Merge commit 'origin/master-tx'
X-Git-Url: http://git.meshlink.io/?a=commitdiff_plain;h=ca05343f045a05f52141c920a53812c565d9d66c;p=catta

Merge commit 'origin/master-tx'
---

ca05343f045a05f52141c920a53812c565d9d66c