]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'feature/haystack' of github.com:Parisson/Telemeta into feature/haystack
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Jun 2015 11:25:10 +0000 (13:25 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Jun 2015 11:25:10 +0000 (13:25 +0200)

Trivial merge