Merge remote branch 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Fri, 18 Sep 2009 20:16:59 +0000 (22:16 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 18 Sep 2009 20:16:59 +0000 (22:16 +0200)
commit3cb8e0191c9e79a4d39f788b42449d12032b462c
tree3dfbe35227a39bfd60e3ab0138144beb1da53712
parent9697c5dc18e8fcc270c2e1871826940b17ecc07e
parent62b8780541e8cce1e1c0a33243c67f13fd08e1cf
Merge remote branch 'origin/master-tx'