chiark / gitweb /
Merge branch 'master' into journal
authorLennart Poettering <lennart@poettering.net>
Wed, 12 Oct 2011 02:29:11 +0000 (04:29 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 12 Oct 2011 02:29:11 +0000 (04:29 +0200)
commit689b9a22f7fa89686b2b5240b7ee9f449dea5630
tree47d44e0bdb73c40808a5150e081a286df38a055e
parentcec736d21ff86c4ac81b4d306ddba2120333818c
parent64685e0cea62b4937f0804e47ce2cb7929f58223
Merge branch 'master' into journal
Makefile.am
src/util.c
src/util.h