From: yomguy <yomguy@parisson.com>
Date: Wed, 25 Jul 2012 01:05:00 +0000 (+0200)
Subject: Merge branch 'hotfix/version'
X-Git-Tag: version
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6367a6a4c25e81dec3a0f5a6e738e3c8a814ae4e;p=teleforma.git

Merge branch 'hotfix/version'
---

5d85e1a888666d86d6883bdeef36b57dffca5922