diff options
| author | Tom Gundersen <teg@jklm.no> | 2011-06-06 02:27:39 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2011-06-06 02:27:39 +0200 |
| commit | 3ac781f2f188b4e9c698aba7ede6154a64ffc679 (patch) | |
| tree | 73e6113f7d03beab9ea18672acf03859c10a4366 /network | |
| parent | 36f31f686374ae3f2311f8674e0a91022d502576 (diff) | |
| parent | 7a6fc752cf8dc09b9358810d947e6e01f9a8fc25 (diff) | |
| download | initscripts-3ac781f2f188b4e9c698aba7ede6154a64ffc679.tar.xz | |
Merge remote-tracking branch 'djgera/djgera'
Conflicts:
rc.single
rc.sysinit
Mostly trivial conflicts with Dave's path purging
Signed-off-by: Tom Gundersen <teg@jklm.no>
Diffstat (limited to 'network')
0 files changed, 0 insertions, 0 deletions