From: yomguy <yomguy@parisson.com>
Date: Mon, 15 Jul 2013 22:39:25 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-server into dev
X-Git-Tag: 1.0~15^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2e3ea9b6cdc2f74366eed325e98b1e3519670984;p=telecaster-server.git

Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-server into dev
---

2e3ea9b6cdc2f74366eed325e98b1e3519670984