systemd: merge branch 'systemd'
authorBeniamino Galvani <bgalvani@redhat.com>
Mon, 11 May 2015 07:20:33 +0000 (09:20 +0200)
committerBeniamino Galvani <bgalvani@redhat.com>
Mon, 11 May 2015 07:20:33 +0000 (09:20 +0200)
commitcaac8785da53bed7c157912b4926e2c09ca53c14
tree71bc3ab34d91f29b22d2bb79fea8a777637191db
parent8ff2c2e93660af86d77cf3351f78ebac21a93031
parenteab389bd8af0c8843bdcfaa3330fb6532e02574f
systemd: merge branch 'systemd'

Conflicts:
src/systemd/src/shared/strv.c
src/systemd/src/shared/util.c
src/systemd/src/shared/path-util.c
src/systemd/src/shared/path-util.h
src/systemd/src/shared/strv.c
src/systemd/src/shared/strv.h
src/systemd/src/shared/util.c
src/systemd/src/shared/util.h