Merge branch journald
authorMarkus Raab <elektra@markus-raab.org>
Mon, 31 Mar 2014 15:57:36 +0000 (17:57 +0200)
committerMarkus Raab <elektra@markus-raab.org>
Mon, 31 Mar 2014 15:57:36 +0000 (17:57 +0200)
commit3c31fbf5c64b88459f22ff7c661bad5ee8ee980b
tree43d7cc5c9b03f967c62e5069e72d4cad3b8bec11
parente7ca2d928a9fd3ce9a0c44a5cbd1162a5f887692
parentdd7195726ab34d3e9e9425d37ce697d4dd17df93
Merge branch journald