Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

author David Sarrut <david.sarrut@creatis.insa-lyon.fr>

Mon, 25 Aug 2014 08:15:01 +0000 (10:15 +0200)

committer David Sarrut <david.sarrut@creatis.insa-lyon.fr>

Mon, 25 Aug 2014 08:15:01 +0000 (10:15 +0200)
author David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Mon, 25 Aug 2014 08:15:01 +0000 (10:15 +0200)
committer David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Mon, 25 Aug 2014 08:15:01 +0000 (10:15 +0200)
diff --cc tools/clitkImageStatisticsGenericFilter.txx
Simple merge
author	David Sarrut <david.sarrut@creatis.insa-lyon.fr>
	Mon, 25 Aug 2014 08:15:01 +0000 (10:15 +0200)
committer	David Sarrut <david.sarrut@creatis.insa-lyon.fr>
	Mon, 25 Aug 2014 08:15:01 +0000 (10:15 +0200)