]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into sabiod
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 22 Jan 2014 13:28:55 +0000 (14:28 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 22 Jan 2014 13:28:55 +0000 (14:28 +0100)

Trivial merge