From: Guillaume Pellerin Date: Fri, 28 Jun 2013 22:36:28 +0000 (+0200) Subject: Merge branch 'dev' into diadems X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a2b6fd4e8b7fdbc46da5b5f44641fe2fc8fd98fc;p=telemeta.git Merge branch 'dev' into diadems --- a2b6fd4e8b7fdbc46da5b5f44641fe2fc8fd98fc