]> git.meshlink.io Git - catta/commitdiff
Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Fri, 12 Dec 2008 18:48:14 +0000 (19:48 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 12 Dec 2008 18:48:14 +0000 (19:48 +0100)

Trivial merge