Merge branch 'master' of ssh://git.onelab.eu/git/sfa
Thierry Parmentelat [Tue, 6 Dec 2011 14:21:19 +0000 (15:21 +0100)]
1  2 
sfa.spec

diff --cc sfa.spec
Simple merge