Merge branch 'split-journalctl' into sisyphus
commitb671257780098d616e652d933e14cc923e3093ac
authorIvan Zakharyaschev <imz@altlinux.org>
Thu, 2 Jan 2014 17:00:07 +0000 (2 21:00 +0400)
committerIvan Zakharyaschev <imz@altlinux.org>
Thu, 2 Jan 2014 17:00:07 +0000 (2 21:00 +0400)
tree03f589b11973defc57482a5a28483815d404876a
parent81a9f33d5cdfd9f5797b2431c7c054c40ce17e0d
parent845f9b9b3508a0764765eed0e5cd2cb34b02ee16
Merge branch 'split-journalctl' into sisyphus

Conflicts:
systemd.spec
systemd.spec