]> git.meshlink.io Git - catta/commitdiff
Merge remote branch 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Mon, 28 Jun 2010 15:56:15 +0000 (17:56 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 28 Jun 2010 15:56:15 +0000 (17:56 +0200)

Trivial merge