diff options
| author | Tom Gundersen <teg@jklm.no> | 2011-04-30 21:30:29 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2011-04-30 21:30:29 +0200 |
| commit | e98a352e9568ec31b33af8671987d026f1f73647 (patch) | |
| tree | 0c6605baf7d16c565e6f908f7005838ad61c903c /rc.shutdown | |
| parent | a43cb3c03ca768956ceb9e2856683eae5c48c68f (diff) | |
| parent | 69b4aac9d13d3c4a6c4604cfb763033aa0dab3d6 (diff) | |
Merge remote-tracking branch 'seblu/master'
Conflicts:
rc
Trivial conflict with Dave's counting vs summing patch.
Signed-off-by: Tom Gundersen <teg@jklm.no>
Diffstat (limited to 'rc.shutdown')
0 files changed, 0 insertions, 0 deletions