Merge branch 'master' of /home/users/gc/gitrepos/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Thu, 23 Aug 2018 08:26:23 +0000 (10:26 +0200)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Thu, 23 Aug 2018 08:26:23 +0000 (10:26 +0200)

Trivial merge