From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 22 Jul 2013 16:37:12 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telecaster-server
X-Git-Tag: 1.0~3^2~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d131b8b1ae2f9693771fcd8cebc81d5ae3c28e3f;p=telecaster-server.git

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

Conflicts:
	tcserver/conf/etc/network/if-up.d/telecaster-rsync
---

d131b8b1ae2f9693771fcd8cebc81d5ae3c28e3f