]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/master' into feature/haystack
authorRaouf Benmansour <rbenmansour@iut.univ-paris8.fr>
Thu, 17 Dec 2015 11:10:38 +0000 (12:10 +0100)
committerRaouf Benmansour <rbenmansour@iut.univ-paris8.fr>
Thu, 17 Dec 2015 11:10:38 +0000 (12:10 +0100)

Trivial merge