Merge branch 'ls/shutdown'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 Dec 2006 17:08:15 +0000 (18:08 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 Dec 2006 17:08:15 +0000 (18:08 +0100)
commitfb582e10172d881c48089332f44e1af857f82938
treed879c002d979ad516e441dd01b51ba39bb5893d0
parent63b17f56013ccbe262a745f418dc294b72408b02
parent57a8ff5a5323adf35c978ed23a7f0b4761a177c1
Merge branch 'ls/shutdown'