From: yomguy <yomguy@parisson.com>
Date: Wed, 7 Mar 2012 17:19:01 +0000 (+0100)
Subject: Merge branch 'master' into fulljs
X-Git-Tag: 0.9~79
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=deee16d0c4642cc2a1b43edfac614f2ea1e1ad80;p=telecaster-client.git

Merge branch 'master' into fulljs
---

deee16d0c4642cc2a1b43edfac614f2ea1e1ad80