From: yomguy <yomguy@parisson.com>
Date: Wed, 2 May 2012 14:31:24 +0000 (+0200)
Subject: Merge branch 'master' into instru_search
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b02f99277fe3e208dba25718a12d44c93988147e;p=telemeta.git

Merge branch 'master' into instru_search
---

b02f99277fe3e208dba25718a12d44c93988147e