diff options
author | Lennart Poettering <lennart@poettering.net> | 2011-10-12 04:29:11 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2011-10-12 04:29:11 +0200 |
commit | 689b9a22f7fa89686b2b5240b7ee9f449dea5630 (patch) | |
tree | 47d44e0bdb73c40808a5150e081a286df38a055e /CODING_STYLE | |
parent | cec736d21ff86c4ac81b4d306ddba2120333818c (diff) | |
parent | 64685e0cea62b4937f0804e47ce2cb7929f58223 (diff) |
Merge branch 'master' into journal
Diffstat (limited to 'CODING_STYLE')
0 files changed, 0 insertions, 0 deletions