diff options
author | Tom Gundersen <teg@jklm.no> | 2011-06-01 01:56:48 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2011-06-01 01:56:48 +0200 |
commit | a41c290180a5f7d0c7aa9eef2210956dd0a8bc63 (patch) | |
tree | a8b6048add82d728041617f66c10b11d6619bbbd /rc.sysinit | |
parent | 017b5a689363aac54313b6e51d0da713f33787b7 (diff) | |
parent | aac43067a13f1940f8f81f45142463e85ce21de2 (diff) | |
download | initscripts-a41c290180a5f7d0c7aa9eef2210956dd0a8bc63.tar.xz |
Merge branch 'snowman'2011.06.1
Conflicts:
rc.d
Trivial conflict with dave's eval purge.
Signed-off-by: Tom Gundersen <teg@jklm.no>
Diffstat (limited to 'rc.sysinit')
0 files changed, 0 insertions, 0 deletions