]> git.meshlink.io Git - catta/commitdiff
Merge branch 'master-tx'
authorLennart Poettering <lennart@poettering.net>
Fri, 8 Aug 2008 14:45:17 +0000 (16:45 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 8 Aug 2008 14:45:17 +0000 (16:45 +0200)

Trivial merge