]> err.no Git - systemd/commit
Merge commit 'v11'
authorTollef Fog Heen <tfheen@err.no>
Thu, 7 Oct 2010 19:45:15 +0000 (21:45 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 7 Oct 2010 19:45:15 +0000 (21:45 +0200)
commit6a0538723dd8702fa66261d363ccc23e1c6f9def
tree0650ca546c2725694e30a854be4284cf5300839b
parente6f9c18834b1473dd8357d588544de67cf90d12d
parent68ce1b7f2d70db4a248b62e602086d7420a99e3b
Merge commit 'v11'

Conflicts:
units/debian/halt.service
units/debian/killall.service
units/debian/poweroff.service
units/debian/reboot.service
Makefile.am
units/multi-user.target.m4