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

Merge branch 'master' into instru_search
---

960da6ea3898a390f5ebfc806f8fbe83e903ee85