| commit | 975c6ee564162419cfb589ee2d3f497c2b11e8c9 | [log] [tgz] |
|---|---|---|
| author | Lennart Poettering <lennart@poettering.net> | Sat Apr 02 03:23:36 2011 +0200 |
| committer | Lennart Poettering <lennart@poettering.net> | Sat Apr 02 03:23:36 2011 +0200 |
| tree | 23326ea5f5a2caee175e8a74ec3707f8c915655e | |
| parent | b9a4269fb288cffeac208aa7845ac25aad8954b0 [diff] | |
| parent | 77dedcce4cd3592feb0e49b84c0fc29f96c64db8 [diff] |
Merge remote-tracking branch 'origin/master-tx'