From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 28 Jun 2010 15:56:15 +0000 (+0200)
Subject: Merge remote branch 'origin/master-tx'
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=53ac2245c30daf71413dc52b07676bdd823729b4;p=catta

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

53ac2245c30daf71413dc52b07676bdd823729b4