From: yomguy <yomguy@parisson.com>
Date: Tue, 13 Nov 2012 13:38:40 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.0~17
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=469ac0308edd5eb964e7b2f39d4c0f470de225ea;p=telecaster-server.git

Merge branch 'dev'
---

469ac0308edd5eb964e7b2f39d4c0f470de225ea