summaryrefslogtreecommitdiffstats
path: root/src/daemon
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-08-05 15:08:29 +0200
committerLennart Poettering <lennart@poettering.net>2009-08-05 15:08:29 +0200
commit42f92a8087b2cefdee47439bcd0a79c7f883af03 (patch)
tree240dd17252e5ff0a0a688da123f0ebb1e18a69c4 /src/daemon
parent8483de4f2be22338eaa42d3b9bad6bf554644b61 (diff)
parent19f2ffba49da3fba4daf1a1aba68c3ae35f9362b (diff)
Merge commit 'origin/master-tx'
Conflicts: po/pl.po po/pt.po po/pt_BR.po
Diffstat (limited to 'src/daemon')
0 files changed, 0 insertions, 0 deletions