From: Guillaume Pellerin Date: Fri, 12 Sep 2014 07:40:50 +0000 (+0200) Subject: Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4a1f98171f46e332b0c9adf9df6494babe3c5974;p=telemeta-doc.git Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev --- 4a1f98171f46e332b0c9adf9df6494babe3c5974