]> err.no Git - systemd/commit
Merge remote branch 'origin/master'
authorTollef Fog Heen <tfheen@err.no>
Thu, 27 May 2010 20:59:13 +0000 (22:59 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 27 May 2010 20:59:13 +0000 (22:59 +0200)
commit827ac65630f7f401a4876fb36d18530922871cf4
tree1ac632856769eb7534efa1164c57de825b7274e5
parentcf586269a3a738275d31cf24403f94ca0946ecfb
parentf306f4c40d7004be058678ff3ed90c9c006767e0
Merge remote branch 'origin/master'

Conflicts:
units/getty@.service.m4
units/multi-user.target.m4
Makefile.am
units/getty@.service.m4
units/multi-user.target.m4