]> git.meshlink.io Git - catta/commitdiff
Merge remote branch 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Mon, 4 Oct 2010 19:23:46 +0000 (21:23 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 4 Oct 2010 19:23:46 +0000 (21:23 +0200)

Trivial merge