]> git.meshlink.io Git - catta/commitdiff
Merge remote-tracking branch 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Sat, 2 Apr 2011 01:23:36 +0000 (03:23 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 2 Apr 2011 01:23:36 +0000 (03:23 +0200)

Trivial merge