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

Merge branch 'master' into instru_search
---

49edfe4546b50922aca4053b581ff665014db22a