From: yomguy <yomguy@parisson.com>
Date: Sun, 11 Mar 2012 20:55:31 +0000 (+0100)
Subject: Merge branch 'master' into fulljs
X-Git-Tag: 0.9~76
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e9092c35e2188b67a71e79b3ab1140fe95bf214c;p=telecaster-client.git

Merge branch 'master' into fulljs
---

e9092c35e2188b67a71e79b3ab1140fe95bf214c