Merge branch 'master' of ssh://git.onelab.eu/git/sliceimage
Thierry Parmentelat [Wed, 28 Mar 2012 14:20:46 +0000 (16:20 +0200)]
1  2 
cron.d/sliceimage
initscripts/sliceimage

Simple merge
Simple merge