From: Guillaume Pellerin Date: Mon, 27 Apr 2015 16:38:29 +0000 (+0200) Subject: Merge branch 'dev' into lam2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2509673f2d6a845770b55e58b4c22b3d75b10149;p=telemeta.git Merge branch 'dev' into lam2 --- 2509673f2d6a845770b55e58b4c22b3d75b10149