From: Sylvain Papa <sylvain.papa@yahoo.fr>
Date: Wed, 16 Jan 2019 12:54:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.piment-noir.org/?p=Persons_Comparator.git;a=commitdiff_plain;h=3fc1aed88123babd636df3a0de26a4a87e472497

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Main.java
---

3fc1aed88123babd636df3a0de26a4a87e472497