From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 4 Oct 2010 19:23:46 +0000 (+0200)
Subject: Merge remote branch 'origin/master-tx'
X-Git-Url: http://git.meshlink.io/?p=catta;a=commitdiff_plain;h=78061979a21cf3b6f3266b1dc2f3d310d893d99f

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

78061979a21cf3b6f3266b1dc2f3d310d893d99f