summaryrefslogtreecommitdiff
path: root/test2
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-12-31 00:59:37 +0100
committerLennart Poettering <lennart@poettering.net>2011-12-31 00:59:37 +0100
commitdc1ecd78e9f046880d10ddb45cf9b06df1084b10 (patch)
tree696491346a7fa69f8620a99cb7c0d2d87f2da7cf /test2
parent69b1c67463de64fb32ba75f586f0c9d2716f3e02 (diff)
parent74ef2d16ada74db3059d825ce8d24ea74946bf8f (diff)
Merge branch 'journal'
Diffstat (limited to 'test2')
0 files changed, 0 insertions, 0 deletions