]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 10 Jan 2013 11:04:21 +0000 (12:04 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 10 Jan 2013 11:04:21 +0000 (12:04 +0100)

Trivial merge