Fix a merge issue 18/4318/1
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Fri, 24 Jun 2011 15:51:02 +0000 (17:51 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Fri, 24 Jun 2011 15:51:02 +0000 (17:51 +0200)
commitb1bfcb099eb73e8305f02951f53309a58d7d98a0
tree8efd8bcab184b9b51b71b1f8268c5d5be1153c5f
parent73cfbb978620c9a34466bb3ec789de774e99a336
Fix a merge issue

Change-Id: Ic2b8a981c341643f76936b053b12b859999b1966
git_hooks/pre-commit