Code

Merge branch 'ls/shutdown'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 Dec 2006 19:53:45 +0000 (20:53 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 Dec 2006 19:53:45 +0000 (20:53 +0100)
commit44d73d6556833bcfbc4678a01731aafee95c3caf
tree0bb38639aa0756628c1db3ac245d123f7a64c33b
parentfb582e10172d881c48089332f44e1af857f82938
parented8dda96183e5655fa6bbca0b779e83aa4db7687
Merge branch 'ls/shutdown'