]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Dec 2013 22:12:03 +0000 (23:12 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Dec 2013 22:12:03 +0000 (23:12 +0100)

Trivial merge