]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'master' of git.parisson.com:git/telemeta-doc
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 18 Mar 2014 11:21:02 +0000 (12:21 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 18 Mar 2014 11:21:02 +0000 (12:21 +0100)

Trivial merge