From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 13 Jul 2010 01:01:51 +0000 (+0200)
Subject: Merge remote branch 'origin/master-tx'
X-Git-Url: http://git.meshlink.io/?p=catta;a=commitdiff_plain;h=a50ab2d8de27e616c9834df3063d99da6ebbd2ac

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

a50ab2d8de27e616c9834df3063d99da6ebbd2ac