diff options
| author | Tom Gundersen <teg@jklm.no> | 2011-06-08 01:11:37 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2011-06-08 01:11:37 +0200 |
| commit | 663f5e917994b674d4fbe184ff262f94da11256e (patch) | |
| tree | 72fafb4d759960bb2b729910b6a84498ceca18ba /network | |
| parent | 3ac781f2f188b4e9c698aba7ede6154a64ffc679 (diff) | |
| parent | 32047175759770ac0b37a1fede68a13e2b4d4fdd (diff) | |
| download | initscripts-663f5e917994b674d4fbe184ff262f94da11256e.tar.xz | |
Merge branch 'snowman'
Conflicts:
rc.multi
rc.single
Trivial conflict, and fixed a bug introduced when I imported the patches in the first place (oops).
Signed-off-by: Tom Gundersen <teg@jklm.no>
Diffstat (limited to 'network')
0 files changed, 0 insertions, 0 deletions