Revert "merge assez suspect 2"
revert des merge suspect
This reverts commit 17c6429ae48bed03b6fc25bb33773500df404ec7, reversing
changes made to 4c3ba737450b671395fb482dc1ef5299ded55f9d.
Revert "commit assez suspect, a revoir"
revert
This reverts commit 4c3ba737450b671395fb482dc1ef5299ded55f9d, reversing
changes made to c2af2648cedf1755bd3af942280c40580cb63a5d.
Merge branch 'mic'
crop encore

Conflicts:
	SiteSentinellesHY/Formulaires/FRMPanneauDeControle.aspx
	SiteSentinellesHY/Formulaires/FRMPanneauDeControle.aspx.vb
cherry-pick des merge