Merge branch 'master' of git.piment-noir.org:TP_POO
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Tue, 13 Feb 2018 18:14:47 +0000 (19:14 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Tue, 13 Feb 2018 18:14:47 +0000 (19:14 +0100)

Trivial merge