]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
authorDavid Palomares <d.palomares@libelium.com>
Thu, 2 Mar 2017 16:43:50 +0000 (17:43 +0100)
committerDavid Palomares <d.palomares@libelium.com>
Thu, 2 Mar 2017 16:43:50 +0000 (17:43 +0100)

Trivial merge