From: Guillaume Pellerin Date: Tue, 18 Mar 2014 11:21:02 +0000 (+0100) Subject: Merge branch 'master' of git.parisson.com:git/telemeta-doc X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6ef826639c2294e7a6b37fe1b674545eeae75a1d;p=telemeta-doc.git Merge branch 'master' of git.parisson.com:git/telemeta-doc --- 6ef826639c2294e7a6b37fe1b674545eeae75a1d