]> err.no Git - systemd/commit
Merge commit 'v29'
authorTollef Fog Heen <tfheen@err.no>
Wed, 29 Jun 2011 11:52:18 +0000 (13:52 +0200)
committerTollef Fog Heen <tfheen@err.no>
Wed, 29 Jun 2011 11:52:18 +0000 (13:52 +0200)
commita169c578d55a928f60619174b542db32faeb666b
tree0f3be1f0f122c971330d7252fff1e6a186b98a5f
parent1aa71a4d4ea5c8cd238f7495a3a3803a96395cc1
parentf9a61ef2c9e3b330d9e2e37977b3dd5758a4b853
Merge commit 'v29'

Conflicts:
units/remote-fs.target
units/remote-fs.target