]> git.parisson.com Git - telecaster-server.git/commit
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telecaster-server
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Jul 2013 16:37:12 +0000 (18:37 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Jul 2013 16:37:12 +0000 (18:37 +0200)
commitd131b8b1ae2f9693771fcd8cebc81d5ae3c28e3f
tree54a82509b254a005b57e89a58fd8565857378fed
parent310eff147c3ed98beecd709d1636ec0edeb2d936
parent6b6778901da74e29b8d4d0e22f17c4f3879c8cb3
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telecaster-server

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