]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into sabiod
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 23 Jan 2014 08:51:06 +0000 (09:51 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 23 Jan 2014 08:51:06 +0000 (09:51 +0100)

Trivial merge