Simone Bordet 347c48d657 Revert "resolve merge and update license headers" ... This reverts commit 53b31b03dd, reversing changes made to 4565c186d7.		2017-01-19 18:26:43 +01:00
..
src	Revert "resolve merge and update license headers"	2017-01-19 18:26:43 +01:00
pom.xml	Fixes #1275 - Get rid of Mockito.	2017-01-18 17:09:57 +01:00