]> err.no Git - systemd/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 12 Oct 2011 06:41:27 +0000 (08:41 +0200)
committerTollef Fog Heen <tfheen@err.no>
Wed, 12 Oct 2011 06:41:27 +0000 (08:41 +0200)
commitadec45b2fed38c4e794efa8c297709208d3ca899
tree559b44b9befe09c4905dbc35123c9f74c12da764
parent14fe596381d7ab53173b638a096fed9a078e8607
parent9f539f05b7b9f6ec57e0a195b550a4ed514a1354
Merge branch 'master' into debian

Update to v37

Conflicts:
units/remount-rootfs.service
src/service.c
units/remount-rootfs.service