From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 8 Aug 2008 14:45:17 +0000 (+0200)
Subject: Merge branch 'master-tx'
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=227dede00badc23e62ad6c44381c1b094b41bb02;p=catta

Merge branch 'master-tx'
---

227dede00badc23e62ad6c44381c1b094b41bb02