Merge branch 'master' into master-tx
authorLennart Poettering <lennart@poettering.net>
Mon, 8 Sep 2008 14:25:16 +0000 (17:25 +0300)
committerLennart Poettering <lennart@poettering.net>
Mon, 8 Sep 2008 14:25:16 +0000 (17:25 +0300)
commitc7a77657ffe00b6d52a0c7e3d29f4fcf8537af5f
tree1ac05a5c37df435c164736b684903a926a733b8d
parent6b034f5bfd4a69d5795f2292014f902fd450a8a4
parent821dc1797faa903618c7585d3c053fd7ae6e93db
Merge branch 'master' into master-tx