From: yomguy <yomguy@parisson.com>
Date: Fri, 30 Aug 2013 07:08:46 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.0~3^2~10^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3454188b453e657cb72796a1c134b8cacb5e7b18;p=telecaster-server.git

Merge branch 'master' into dev
---

3454188b453e657cb72796a1c134b8cacb5e7b18