]> err.no Git - systemd/commit
Merge commit 'v24'
authorTollef Fog Heen <tfheen@err.no>
Mon, 11 Apr 2011 19:10:42 +0000 (21:10 +0200)
committerTollef Fog Heen <tfheen@err.no>
Mon, 11 Apr 2011 19:10:42 +0000 (21:10 +0200)
commit015f26d4fd40397c745e28527eb4f758afaaffe4
tree2365cd95fd623fe3859e428bf470fb9e81c0ed87
parent0978508eb4c15a1846e5ef25a0cb9091c72906e0
parent42054a3e4496108ea64bc46084bb056e56adec6c
Merge commit 'v24'

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