Simone Bordet 347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03ddda3776f3db71e28e55312b1c982092, reversing
changes made to 4565c186d7491a97d72217a96e86b15ced506de6.
2017-01-19 18:26:43 +01:00
..
2016-12-20 13:09:32 -07:00